Mercurial > hg > mercurial-crew-with-dirclash
view templates/map-raw @ 1798:d610fe0e6893
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 | 03cb6bf43a9b |
children | c64bef3d7043 |
line wrap: on
line source
header = header-raw.tmpl footer = "" changeset = changeset-raw.tmpl difflineplus = "#line#" difflineminus = "#line#" difflineat = "#line#" diffline = "#line#" changesetparent = "# parent: #node#" changesetchild = "# child: #node#" filenodelink = "" filerevision = filerevision-raw.tmpl fileline = "#line#" diffblock = "#lines#" filediff = filediff-raw.tmpl fileannotate = fileannotate-raw.tmpl annotateline = "#author#@#rev#: #line#"