##// END OF EJS Templates
Merge with crew-stable, fix test output
Patrick Mezard -
r6550:628da4a9 merge default
parent child Browse files
Show More
1 NO CONTENT: modified file chmod 100644 => 100755
@@ -9,9 +9,7 1 files updated, 0 files merged, 0 files
9 9 created new head
10 10 # merge using internal:fail tool
11 11 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
12 There are unresolved merges, you can redo the full merge using:
13 hg update -C 2
14 hg merge 1
12 use 'hg resolve' to retry unresolved file merges
15 13 line 1
16 14 line 2
17 15 third line
General Comments 0
You need to be logged in to leave comments. Login now