Mercurial > public > mercurial-scm > hg

diff tests/test-rebase-conflicts.t @ 32249:27e67cfea27f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: rename "target" to "destination" in messages The help text for rebase calls it "the destination" (never "target"), so let's use that in messages as well.
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 11 May 2017 22:38:15 -0700
parents cf8ad0e6c0e4
children c2380b448265
line wrap: on
line diff
--- a/tests/test-rebase-conflicts.t	Thu May 11 22:38:03 2017 -0700
+++ b/tests/test-rebase-conflicts.t	Thu May 11 22:38:15 2017 -0700
@@ -250,7 +250,7 @@
   rebased as 19c888675e13
   rebasing 10:2f2496ddf49d "merge" (tip)
    future parents are 11 and 7
-   already in target
+   already in destination
    merge against 10:2f2496ddf49d
      detach base 9:e31216eec445
     searching for copies back to rev 3