##// END OF EJS Templates
Update tests
Update tests

File last commit:

r925:5a034646 default
r1043:9344f5dd default
Show More
test-conflict.out
8 lines | 135 B | text/plain | TextLexer
/ tests / test-conflict.out
mpm@selenic.com
merge3: fix argument order...
r346 merge: warning: conflicts during merge
merging a
merging a failed!
mpm@selenic.com
update tests to reflect new short hash length...
r374 32e80765d7fe+75234512624c+ tip
mpm@selenic.com
merge3: fix argument order...
r346 something else
=======
something
mpm@selenic.com
Update test output for status change...
r748 M a