##// END OF EJS Templates
Added tests for bug with three-way-merging of old tip, tip and cwd.
Added tests for bug with three-way-merging of old tip, tip and cwd.

File last commit:

r774:6592c4f5 default
r792:49ec802b default
Show More
test-diffdir
12 lines | 179 B | text/plain | TextLexer
#!/bin/sh
hg init
touch a
hg add a
hg ci -m "a" -d "0 0"
echo 123 > b
hg add b
hg diff | sed "s/\(\(---\|+++\).*\)\t.*/\1/"
hg diff -r tip | sed "s/\(\(---\|+++\).*\)\t.*/\1/"