Mercurial > public > mercurial-scm > hg-stable

diff tests/test-resolve.t @ 30062:940c05b25b07

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 4acd5651ffa2
children 46ba2cdda476
line wrap: on
line diff
--- a/tests/test-resolve.t	Wed Oct 05 15:28:34 2016 +0200
+++ b/tests/test-resolve.t	Fri Oct 07 08:51:50 2016 -0700
@@ -290,6 +290,9 @@
   * version 2 records
   local: 57653b9f834a4493f7240b0681efcb9ae7cab745
   other: dc77451844e37f03f5c559e3b8529b2b48d381d1
+  labels:
+    local: working copy
+    other: merge rev
   unrecognized entry: x	advisory record
   file extras: file1 (ancestorlinknode = 99726c03216e233810a2564cbc0adfe395007eac)
   file: file1 (record type "F", state "r", hash 60b27f004e454aca81b0480209cce5081ec52390)
@@ -312,6 +315,9 @@
   * version 2 records
   local: 57653b9f834a4493f7240b0681efcb9ae7cab745
   other: dc77451844e37f03f5c559e3b8529b2b48d381d1
+  labels:
+    local: working copy
+    other: merge rev
   file extras: file1 (ancestorlinknode = 99726c03216e233810a2564cbc0adfe395007eac)
   file: file1 (record type "F", state "r", hash 60b27f004e454aca81b0480209cce5081ec52390)
     local path: file1 (flags "")