##// END OF EJS Templates
Add instructions how to redo/finish failed merge with local working directory....
Add instructions how to redo/finish failed merge with local working directory. b2ae81a7df29 already implemented this for branch merges.

File last commit:

r3853:c0b44915 default
r3869:ad6f34c8 default
Show More
test-hup
16 lines | 149 B | text/plain | TextLexer
#!/bin/sh
hg init
mkfifo p
hg serve --stdio < p &
P=$!
(echo lock; echo addchangegroup; sleep 5) > p &
Q=$!
sleep 3
kill -HUP $P
wait
ls -R .hg