Mercurial > hg
diff tests/test-issue1175.t @ 42110:3a7efcbdf288
copies: print list of divergent renames in sorted order
The current order is not obvious to the user (and I may change it in a
later patch). Lexicographical order seems like the obvious choice
here.
Differential Revision: https://phab.mercurial-scm.org/D6227
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 12 Apr 2019 09:41:08 -0700 |
parents | f1186c292d03 |
children | 3df0bd706c40 |
line wrap: on
line diff
--- a/tests/test-issue1175.t Fri Apr 12 12:20:38 2019 -0400 +++ b/tests/test-issue1175.t Fri Apr 12 09:41:08 2019 -0700 @@ -14,8 +14,8 @@ $ hg mv a a2 $ hg up note: possible conflict - a was renamed multiple times to: + a1 a2 - a1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg ci -m2