tests/test-simplemerge-cmd.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Tue, 17 Jul 2007 09:08:29 -0300
changeset 4894 be5dc5e3ab2d
parent 4364 d5c3a70f8422
child 5081 ea7b982b6c08
permissions -rw-r--r--
hg parents: don't pass an OS-specific path to repo.filectx The only reason to use the matcher code instead of calling util.canonpath directly is to be able to use "path:canonical/path/to/file" patterns.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4364
d5c3a70f8422 polish the simplemerge command; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
     1
(binary:application/octet-stream)