Mercurial > hg

view tests/test-merge9.out @ 5820:3a1ffc1da32c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed numerous XHTML problems that caused validation errors and warnings. Link elements for Atom and RSS feeds had no end tag. <div> block element inside <a> in-line element isn't right and caused rendering problems on Safari. Spurious </div> tag in search forms. Branch entry missing closing </a> tag.
author Kevin Christen <kevin.christen@gmail.com>
date Mon, 07 Jan 2008 21:29:40 -0600
parents f191bc3916f7
children 5af5f0f9d724
line wrap: on
line source

adding bar
adding foo
adding quux1
adding quux2
merging bar
merging bar failed!
merging foo and baz
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 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