Mercurial > hg
diff tests/test-merge10.t @ 41510:faa49a5914bb
merge: respect ui.relative-paths
We print file paths in a lot of places in this code and I've probably
missed a few places. We can fix them as we discover them (I'm also
happy to fix anything reviewers notice, of course).
Differential Revision: https://phab.mercurial-scm.org/D5747
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Wed, 30 Jan 2019 12:05:43 -0800 |
parents | eb586ed5d8ce |
children |
line wrap: on
line diff
--- a/tests/test-merge10.t Tue Jan 29 18:46:11 2019 -0500 +++ b/tests/test-merge10.t Wed Jan 30 12:05:43 2019 -0800 @@ -37,8 +37,9 @@ (run 'hg heads' to see heads, 'hg merge' to merge) $ hg up -C 2 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg merge - merging testdir/subdir/a and testdir/a to testdir/subdir/a +Abuse this test for also testing that merge respects ui.relative-paths + $ hg --cwd testdir merge --config ui.relative-paths=yes + merging subdir/a and a to subdir/a 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) $ hg stat