Mercurial > hg
comparison tests/test-commit-amend.t @ 27163:27b89a0957ec
filemerge: add a 'leave unresolved' option to change/delete prompts
We're going to make this option the default in an upcoming patch.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Mon, 30 Nov 2015 13:43:55 -0800 |
parents | 0829ed3b75e1 |
children | fe150586d9bd |
comparison
equal
deleted
inserted
replaced
27162:4ab69be0ea15 | 27163:27b89a0957ec |
---|---|
810 $ hg up -q default | 810 $ hg up -q default |
811 $ echo aa >> aa | 811 $ echo aa >> aa |
812 $ hg ci -m aa | 812 $ hg ci -m aa |
813 $ hg merge -q bar | 813 $ hg merge -q bar |
814 local changed aa which remote deleted | 814 local changed aa which remote deleted |
815 use (c)hanged version or (d)elete? c | 815 use (c)hanged version, (d)elete, or leave (u)nresolved? c |
816 $ hg ci -m 'merge bar (with conflicts)' | 816 $ hg ci -m 'merge bar (with conflicts)' |
817 $ hg log --config diff.git=1 -pr . | 817 $ hg log --config diff.git=1 -pr . |
818 changeset: 33:97a298b0c59f | 818 changeset: 33:97a298b0c59f |
819 tag: tip | 819 tag: tip |
820 parent: 32:3d78ce4226b8 | 820 parent: 32:3d78ce4226b8 |