Mercurial Mercurial > hg > mercurial-crew-with-dirclash / file revision
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-debugrename.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Fri, 22 Jun 2007 20:44:40 -0300
changeset 4681 dc5920ea12f8
parent 4637 5a088ac232e6
permissions -rw-r--r--
merge: fix small bug with a failed merge across a rename If $HGMERGE wasn't able to fix the conflicts, we wouldn't copy f to fd, and util.set_exec wouldn't find the file.

adding a
b renamed from a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
a renamed from b:9a263dd772e0159ddfa70fb8a448bb6c7ec8c69f
% test with --rev
b renamed from a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
mercurial-crew-with-dirclash