Mercurial > hg
diff tests/test-bundle-r.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 | 8d72e29ad1e0 |
line wrap: on
line diff
--- a/tests/test-bundle-r.t Fri Apr 12 12:20:38 2019 -0400 +++ b/tests/test-bundle-r.t Fri Apr 12 09:41:08 2019 -0700 @@ -317,8 +317,8 @@ $ cd ../test $ hg merge 7 note: possible conflict - afile was renamed multiple times to: + adifferentfile anotherfile - adifferentfile 2 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) $ hg ci -m merge