Mercurial > hg
diff tests/test-rename-merge2.t @ 30062:940c05b25b07
merge: add conflict labels to merge command
Now that we present the conflict labels in prompts, it's useful to have
better names than "local" and "other" for every command.
author | Simon Farnsworth <simonfar@fb.com> |
---|---|
date | Fri, 07 Oct 2016 08:51:50 -0700 |
parents | c15f06109b7a |
children | 4d504e541d3d |
line wrap: on
line diff
--- a/tests/test-rename-merge2.t Wed Oct 05 15:28:34 2016 +0200 +++ b/tests/test-rename-merge2.t Fri Oct 07 08:51:50 2016 -0700 @@ -694,7 +694,7 @@ starting 4 threads for background file closing (?) a: prompt deleted/changed -> m (premerge) picked tool ':prompt' for a (binary False symlink False changedelete True) - other changed a which local deleted + other [merge rev] changed a which local [working copy] deleted use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u b: both created -> m (premerge) picked tool 'python ../merge' for b (binary False symlink False changedelete False) @@ -739,7 +739,7 @@ starting 4 threads for background file closing (?) a: prompt changed/deleted -> m (premerge) picked tool ':prompt' for a (binary False symlink False changedelete True) - local changed a which other deleted + local [working copy] changed a which other [merge rev] deleted use (c)hanged version, (d)elete, or leave (u)nresolved? u b: both created -> m (premerge) picked tool 'python ../merge' for b (binary False symlink False changedelete False)