##// END OF EJS Templates
histedit: make check for unresolved conflicts explicit (issue5545)...
histedit: make check for unresolved conflicts explicit (issue5545) Previously, we'd rely on the implicit check that `localrepo.commit` did. The problem is that that check only happened when the working copy was dirty. With a "clean" working copy but unresolved conflicts we'd get into a broken state. To fix that, do what rebase does and check for unresolved conflicts at the start of histedit --continue.

File last commit:

r2341:dbbe7f72 default
r32057:e5ffc91a stable
Show More
Makefile
13 lines | 160 B | text/x-makefile | MakefileLexer
CC := gcc
CFLAGS := -g -O2 -Wall -Werror
prefix ?= /usr/bin
hgsh: hgsh.o
$(CC) -o $@ $<
install: hgsh
install -m755 hgsh $(prefix)
clean:
rm -f *.o hgsh