Mercurial > hg-stable

diff tests/test-commit-amend.t @ 23505:bd5dbb8a05c8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
graft: show more useful status information while grafting Show status messages with first line of commit description and names, like grafting 12:2647734878ef "fork" (tip) This gives more context for the user when resolving conflicts.
author Mads Kiilerich <madski@unity3d.com>
date Tue, 09 Dec 2014 03:38:23 +0100
parents e53f6b72a0e4
children 8063901e56cd
line wrap: on
line diff
--- a/tests/test-commit-amend.t	Tue Dec 09 03:37:55 2014 +0100
+++ b/tests/test-commit-amend.t	Tue Dec 09 03:38:23 2014 +0100
@@ -447,7 +447,7 @@
   $ hg up 11
   5 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg graft 12
-  grafting revision 12
+  grafting 12:2647734878ef "fork" (tip)
   $ hg ci --amend -m 'graft amend'
   saved backup bundle to $TESTTMP/.hg/strip-backup/bd010aea3f39-amend-backup.hg (glob)
   $ hg log -r . --debug | grep extra