Mercurial Mercurial > hg > mercurial-crew-with-dirclash / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-simplemerge-cmd.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Sat, 28 Apr 2007 17:55:45 -0300
changeset 4385 93a4e72b4f83
parent 4360 d5c3a70f8422
child 5115 ea7b982b6c08
permissions -rw-r--r--
run-tests.py: pass -L/--label to simplemerge This should give us conflict markers that don't change from one run to another. Remove some sed's/egrep's from some tests.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4360
d5c3a70f8422 polish the simplemerge command; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     1
 
(binary:application/octet-stream)
mercurial-crew-with-dirclash