equal
deleted
inserted
replaced
811 $ echo aa >> aa |
811 $ echo aa >> aa |
812 $ hg ci -m aa |
812 $ hg ci -m aa |
813 $ hg merge -q bar --config ui.interactive=True << EOF |
813 $ hg merge -q bar --config ui.interactive=True << EOF |
814 > c |
814 > c |
815 > EOF |
815 > EOF |
816 local changed aa which remote deleted |
816 local changed aa which other deleted |
817 use (c)hanged version, (d)elete, or leave (u)nresolved? c |
817 use (c)hanged version, (d)elete, or leave (u)nresolved? c |
818 $ hg ci -m 'merge bar (with conflicts)' |
818 $ hg ci -m 'merge bar (with conflicts)' |
819 $ hg log --config diff.git=1 -pr . |
819 $ hg log --config diff.git=1 -pr . |
820 changeset: 33:97a298b0c59f |
820 changeset: 33:97a298b0c59f |
821 tag: tip |
821 tag: tip |