tests/test-conflict.out
author Manpreet Singh <junkblocker@yahoo.com>
Sat, 27 May 2006 20:44:53 -0700
changeset 2350 091d555653a4
parent 2175 b2ae81a7df29
child 4365 46280c004f22
permissions -rw-r--r--
contrib: patch review plugin for vim 7.0 The plugin takes an 'hg export'ed patch (in fact any single or multi file patch) and opens multiple tabs containing vim diff/merge windows for each affected file in the patch allowing full visual code reviews.

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