Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge9.out @ 4875:97dbf330069a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Re: mercurial.el and hg-version-other-window hg-version-other window is unimplemented in mercurial.el. The version below works for me, YMMV.
author jon.christopher@Rigaku.com
date Sat, 14 Jul 2007 11:27:58 -0500
parents dc5920ea12f8
children f191bc3916f7
line wrap: on
line source

adding bar
adding foo
adding quux1
adding quux2
merging bar
merging bar failed!
merging foo and baz
merging foo failed!
1 files updated, 0 files merged, 0 files removed, 2 files unresolved
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
merging baz failed!
1 files updated, 0 files merged, 0 files removed, 2 files unresolved
There are unresolved merges, you can redo the full merge using:
  hg update -C 1
  hg merge 2