Mercurial > hg > mercurial-crew-with-dirclash

diff Makefile @ 1798:d610fe0e6893

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
date Thu, 23 Feb 2006 18:10:04 +0100
parents e84c69b43cdb
children 8a2a7f7d9df6
line wrap: on
line diff