##// END OF EJS Templates
merge with crew-stable
merge with crew-stable

File last commit:

r2175:b2ae81a7 default
r4181:ac9e891f merge default
Show More
test-conflict.out
13 lines | 367 B | text/plain | TextLexer
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
merge: warning: conflicts during merge
merging a
merging a failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
There are unresolved merges, you can redo the full merge using:
hg update -C 2
hg merge 1
e7fe8eb3e180+0d24b7662d3e+ tip
something else
=======
something
M a