##// END OF EJS Templates
[PATCH] Enables lock work under the other 'OS'...
r422:10c43444 default
Show More
test-conflict
17 lines | 298 B | text/plain | TextLexer
mpm@selenic.com
merge3: fix argument order...
r346 #!/bin/bash
set -x
hg init
echo "nothing" > a
hg add a
hg commit -t ancestor -u test -d "0 0"
echo "something" > a
hg commit -t branch1 -u test -d "0 0"
hg co 0
echo "something else" > a
hg commit -t branch2 -u test -d "0 0"
export HGMERGE=merge
hg -d up -m 1
hg id
mpm@selenic.com
Tidy up conflict and pull tests...
r392 grep -Ev ">>>|<<<" a
mpm@selenic.com
merge3: fix argument order...
r346 hg status