Mercurial > hg

diff tests/test-largefiles-update.t @ 29775:978b907d9b36

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: always use other, not remote, in user prompts Now that we store and display merge labels in user prompts (not just conflict markets), we should rely on labels to clarify the two sides of a merge operation (hg merge, hg update, hg rebase etc). "remote" is not a great name here, as it conflates "remote" as in "remote server" with "remote" as in "the side of the merge that's further away". In cases where you're merging the "wrong way" around, remote can even be the "local" commit that you're merging with something pulled from the remote server.
author Simon Farnsworth <simonfar@fb.com>
date Fri, 12 Aug 2016 05:56:40 -0700
parents a7f8939641aa
children a145161debed
line wrap: on
line diff
--- a/tests/test-largefiles-update.t	Fri Aug 12 06:01:42 2016 -0700
+++ b/tests/test-largefiles-update.t	Fri Aug 12 05:56:40 2016 -0700
@@ -611,7 +611,7 @@
   > EOF
   rebasing 1:72518492caa6 "#1"
   rebasing 4:07d6153b5c04 "#4"
-  local [dest] changed .hglf/large1 which remote [source] deleted
+  local [dest] changed .hglf/large1 which other [source] deleted
   use (c)hanged version, (d)elete, or leave (u)nresolved? c
 
   $ hg diff -c "tip~1" --nodates .hglf/large1 | grep '^[+-][0-9a-z]'