##// END OF EJS Templates
warn about new heads on commit (issue842)
warn about new heads on commit (issue842)

File last commit:

r6336:4b0c9c67 default
r6336:4b0c9c67 default
Show More
test-merge9.out
20 lines | 564 B | text/plain | TextLexer
Alexis S. L. Carvalho
merge: fix small bug with a failed merge across a rename...
r4682 adding bar
adding foo
adding quux1
adding quux2
Dirkjan Ochtman
warn about new heads on commit (issue842)
r6336 created new head
Alexis S. L. Carvalho
merge: fix small bug with a failed merge across a rename...
r4682 merging bar
merging bar failed!
merging foo and baz
Matt Mackall
merge: allow smarter tool configuration...
r6004 1 files updated, 1 files merged, 0 files removed, 1 files unresolved
Alexis S. L. Carvalho
merge: fix small bug with a failed merge across a rename...
r4682 There are unresolved merges, you can redo the full merge using:
hg update -C 2
hg merge 1
3 files updated, 0 files merged, 1 files removed, 0 files unresolved
merging bar
merging bar failed!
merging baz and foo
Matt Mackall
merge: allow smarter tool configuration...
r6004 1 files updated, 1 files merged, 0 files removed, 1 files unresolved
Alexis S. L. Carvalho
merge: fix small bug with a failed merge across a rename...
r4682 There are unresolved merges, you can redo the full merge using:
hg update -C 1
hg merge 2