Mercurial > public > mercurial-scm > hg

diff tests/test-up-local-change.t @ 24727:5668202cfaaf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: better debug messages before/after invoking external merge tool
author Mads Kiilerich <mads@kiilerich.com>
date Thu, 19 Mar 2015 22:22:50 +0100
parents 406dfc63a1ad
children eea3977e6fca
line wrap: on
line diff
--- a/tests/test-up-local-change.t	Sat Apr 11 23:00:04 2015 +0900
+++ b/tests/test-up-local-change.t	Thu Mar 19 22:22:50 2015 +0100
@@ -55,6 +55,8 @@
   picked tool 'true' for a (binary False symlink False)
   merging a
   my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a
+  launching merge tool: true $TESTTMP/r2/a * (glob)
+  merge tool returned: 0
   1 files updated, 1 files merged, 0 files removed, 0 files unresolved
   $ hg parents
   changeset:   1:1e71731e6fbb
@@ -76,6 +78,8 @@
   picked tool 'true' for a (binary False symlink False)
   merging a
   my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb
+  launching merge tool: true $TESTTMP/r2/a * (glob)
+  merge tool returned: 0
   0 files updated, 1 files merged, 1 files removed, 0 files unresolved
   $ hg parents
   changeset:   0:c19d34741b0a
@@ -105,6 +109,8 @@
   picked tool 'true' for a (binary False symlink False)
   merging a
   my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a
+  launching merge tool: true $TESTTMP/r2/a * (glob)
+  merge tool returned: 0
   1 files updated, 1 files merged, 0 files removed, 0 files unresolved
   $ hg parents
   changeset:   1:1e71731e6fbb