tests/test-conflict.out
author mpm@selenic.com
Mon, 19 Sep 2005 15:59:17 -0700
changeset 1278 6a0d373d3126
parent 925 5a034646e472
child 1933 7544700fd931
permissions -rw-r--r--
hgit -> hgk.py Move hgit to hgk.py - importing hgit as an extension created compiled hgitc, which was confusing - hgit existed to support hgk so it was slightly misnamed - removed executable bit as we no longer run it directly - add 'view' command so we can run hg view - change git-* commands to debug-* so hg help won't show them - chdir to repository root on view so hgk doesn't choke in subdirs

merge: warning: conflicts during merge
merging a
merging a failed!
32e80765d7fe+75234512624c+ tip
something else
=======
something
M a