Mercurial > hg > mercurial-crew-with-dirclash

comparison doc/hg.1.txt @ 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 47f4fbee32c5
children 7956893e8458 7718885070b1
comparison
equal deleted inserted replaced
1797:42f75cd04bf4 1798:d610fe0e6893