Mercurial > public > mercurial-scm > hg-stable

diff tests/test-issue672.t @ 23482:208ec8ca7c79

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: make 'keep' message more descriptive Most merge action messages don't describe the action itself, they describe the reason the action was taken. The only exeption is the 'k' action, for which the message is just "keep" and instead there is a code comment folling it that says "remote unchanged". Let's move that comment into the merge action message.
author Martin von Zweigbergk <martinvonz@google.com>
date Wed, 03 Dec 2014 14:03:20 -0800
parents cb15835456cb
children bd625cd4e5e7
line wrap: on
line diff
--- a/tests/test-issue672.t	Thu Dec 04 23:08:27 2014 -0500
+++ b/tests/test-issue672.t	Wed Dec 03 14:03:20 2014 -0800
@@ -40,7 +40,7 @@
    1a: remote created -> g
   getting 1a
   updating: 1a 2/2 files (100.00%)
-   2: keep -> k
+   2: remote unchanged -> k
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   (branch merge, don't forget to commit)