Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 2192:2be3ac7abc21

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add bugzilla integration hook. example of writing hook in python. hook updates bugzilla bugs when it sees commit comments that mention bug id, such as "i fixed bug 77". only bugzilla 2.16 supported yet, but easy to extend. bugzilla versions have different schema, i have not used later than 2.16.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Wed, 03 May 2006 14:40:39 -0700
parents b2ae81a7df29
children 46280c004f22
line wrap: on
line source

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
merge: warning: conflicts during merge
merging a
merging a failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
There are unresolved merges, you can redo the full merge using:
  hg update -C 2
  hg merge 1
e7fe8eb3e180+0d24b7662d3e+ tip
something else
=======
something
M a