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-merge3.out
author Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
Thu, 23 Feb 2006 18:10:04 +0100
changeset 1798 d610fe0e6893
parent 1747 91c56c427171
permissions -rw-r--r--
hgmerge: do not use file with markers in tools merging themselves This time I forgot about a crucial part of the logic change. The patch makes kdiff3 and tkdiff useful again.

removing b
nothing changed
mercurial-crew-with-dirclash