Mercurial > hg
diff tests/test-merge-types.t @ 26967:7a8e9a985c3b
filemerge: remove leading space from " no tool found..."
I could not find or see a reason for the unusual formatting. The lines
following it in the test cases are not indented.
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Wed, 11 Nov 2015 10:19:11 -0800 |
| parents | 19c4b93cb7d6 |
| children | 296d55def9c4 |
line wrap: on
line diff
--- a/tests/test-merge-types.t Mon Nov 09 22:31:01 2015 +0900 +++ b/tests/test-merge-types.t Wed Nov 11 10:19:11 2015 -0800 @@ -171,7 +171,7 @@ a: versions differ -> m (premerge) (couldn't find merge tool hgmerge|tool hgmerge can't handle symlinks) (re) picked tool ':prompt' for a (binary False symlink True) - no tool found to merge a + no tool found to merge a keep (l)ocal or take (o)ther? l 0 files updated, 1 files merged, 0 files removed, 0 files unresolved $ hg diff --git