Mercurial > hg

diff tests/test-rename-after-merge.out @ 10893:468876bc3885

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rollback: improve message
author Matt Mackall <mpm@selenic.com>
date Mon, 12 Apr 2010 17:21:30 -0700
parents f0bfe42c7b1f
children 39e7f14a8286
line wrap: on
line diff
--- a/tests/test-rename-after-merge.out	Mon Apr 12 17:11:14 2010 -0700
+++ b/tests/test-rename-after-merge.out	Mon Apr 12 17:21:30 2010 -0700
@@ -34,7 +34,7 @@
 (branch merge, don't forget to commit)
 % commit issue 1476
 copies:      c2 (c1)
-rolling back commit to revision 3
+rolling back to revision 3 (undo commit)
 2 files updated, 0 files merged, 2 files removed, 0 files unresolved
 % merge heads again
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved