Mercurial > public > mercurial-scm > hg
diff tests/test-merge-types.t @ 27164:88d5db4b155c
filemerge: default regular prompts to 'leave unresolved' (BC)
It makes far more sense to leave these conflicts unresolved and kick back to
the user than to just assume that the local version be chosen. There are almost
certainly buggy scripts and applications using Mercurial in the wild that do
merges or rebases non-interactively, and then assume that if the operation
succeeded there's nothing the user needs to pay attention to.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Tue, 01 Dec 2015 09:48:38 -0800 |
| parents | 4ab69be0ea15 |
| children | 72072cfc7e91 |
line wrap: on
line diff
--- a/tests/test-merge-types.t Mon Nov 30 13:43:55 2015 -0800 +++ b/tests/test-merge-types.t Tue Dec 01 09:48:38 2015 -0800 @@ -172,8 +172,10 @@ (couldn't find merge tool hgmerge|tool hgmerge can't handle symlinks) (re) picked tool ':prompt' for a (binary False symlink True changedelete False) no tool found to merge a - keep (l)ocal, take (o)ther, or leave (u)nresolved? l - 0 files updated, 1 files merged, 0 files removed, 0 files unresolved + keep (l)ocal, take (o)ther, or leave (u)nresolved? u + 0 files updated, 0 files merged, 0 files removed, 1 files unresolved + use 'hg resolve' to retry unresolved file merges + [1] $ hg diff --git diff --git a/a b/a old mode 120000