Mercurial > public > mercurial-scm > hg
diff tests/test-merge-internal-tools-pattern.t @ 12328:b63f6422d2a7
tests: fix a bunch of pointless #s in unified tests
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Fri, 17 Sep 2010 17:03:08 -0500 |
| parents | 4134686b83e1 |
| children | ff12a6c63c3d |
line wrap: on
line diff
--- a/tests/test-merge-internal-tools-pattern.t Fri Sep 17 17:03:04 2010 -0500 +++ b/tests/test-merge-internal-tools-pattern.t Fri Sep 17 17:03:08 2010 -0500 @@ -1,5 +1,5 @@ -# Make sure that the internal merge tools (internal:fail, internal:local, and -# internal:other) are used when matched by a merge-pattern in hgrc +Make sure that the internal merge tools (internal:fail, internal:local, and +internal:other) are used when matched by a merge-pattern in hgrc Make sure HGMERGE doesn't interfere with the test: