##// END OF EJS Templates
abort when merging two heads and repository has local changes
abort when merging two heads and repository has local changes

File last commit:

r814:0902ffec merge default
r1581:db10b711 default
Show More
test-merge3
10 lines | 146 B | text/plain | TextLexer
#!/bin/sh
hg init
echo This is file a1 > a
hg add a
hg commit -m "commit #0" -d "0 0"
touch b
hg add b
rm b
hg commit -A -m"comment #1" -d "0 0"