##// 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:

r981:4f81068e merge default
r1581:db10b711 default
Show More
test-diffdir
14 lines | 308 B | text/plain | TextLexer
mpm@selenic.com
Refactor diffrevs/diffdir into changes...
r536 #!/bin/sh
hg init
touch a
hg add a
mpm@selenic.com
Update tests to use commit -m and default -u...
r749 hg ci -m "a" -d "0 0"
mpm@selenic.com
Refactor diffrevs/diffdir into changes...
r536
echo 123 > b
hg add b
TK Soh
test fixes for Solaris 2.6...
r949 hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
-e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"
mpm@selenic.com
Refactor diffrevs/diffdir into changes...
r536
TK Soh
test fixes for Solaris 2.6...
r949 hg diff -r tip | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
-e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"