Mercurial > hg
diff tests/test-sparse-merges.t @ 39284:975d959295ef
filemerge: print the filename in quotes in prompt
This is better as the filename is in quotes and user can understand better what
the filename is and what is important part in the prompt.
Differential Revision: https://phab.mercurial-scm.org/D4373
| author | Pulkit Goyal <pulkit@yandex-team.ru> |
|---|---|
| date | Sat, 25 Aug 2018 21:17:34 +0300 |
| parents | f785073f792c |
| children | a3fd84f4fb38 |
line wrap: on
line diff
--- a/tests/test-sparse-merges.t Tue Aug 14 17:00:32 2018 +0000 +++ b/tests/test-sparse-merges.t Sat Aug 25 21:17:34 2018 +0300 @@ -113,7 +113,7 @@ $ hg merge temporarily included 1 file(s) in the sparse checkout for merging - file d was deleted in local [working copy] but was modified in other [merge rev]. + file 'd' was deleted in local [working copy] but was modified in other [merge rev]. What do you want to do? use (c)hanged version, (d)elete, or leave (u)nresolved? u 0 files updated, 0 files merged, 0 files removed, 1 files unresolved