tests/test-symlink-root.out
author Dov Feldstern <dfeldstern@fastimap.com>
Fri, 04 Apr 2008 02:21:53 +0300
changeset 6522 2b181fb3a70a
parent 4086 cc8a52229620
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:
4086
cc8a52229620 Fix accessing the repo through a symlink.
Jun Inoue <jun.lambda@gmail.com>
parents:
diff changeset
     1
? foo
cc8a52229620 Fix accessing the repo through a symlink.
Jun Inoue <jun.lambda@gmail.com>
parents:
diff changeset
     2
? foo