##// 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
merge: warning: conflicts during merge
merging a
merging a failed!
32e80765d7fe+75234512624c+ tip
something else
=======
something
M a