tests/test-empty.out
author Dov Feldstern <dfeldstern@fastimap.com>
Fri, 04 Apr 2008 02:21:53 +0300
changeset 6522 2b181fb3a70a
parent 2152 57729c56a23c
child 6944 7e5f3480c45b
permissions -rw-r--r--
use internal merge tool when specified for a merge-pattern in hgrc It is possible to specify in the hgrc file that one of the internal merge tools (internal:fail, internal:local or internal:other) be used for performing merges on files matching a given pattern. However, this setting is not being acted upon (the merge tool is not found). This patch fixes that.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1338
2b77ea66fe70 Add empty repo test
mpm@selenic.com
parents:
diff changeset
     1
checking changesets
2b77ea66fe70 Add empty repo test
mpm@selenic.com
parents:
diff changeset
     2
checking manifests
2b77ea66fe70 Add empty repo test
mpm@selenic.com
parents:
diff changeset
     3
crosschecking files in changesets and manifests
2b77ea66fe70 Add empty repo test
mpm@selenic.com
parents:
diff changeset
     4
checking files
2b77ea66fe70 Add empty repo test
mpm@selenic.com
parents:
diff changeset
     5
0 files, 0 changesets, 0 total revisions