Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/filelog.py @ 1699:83e8cd97b9f9
hgmerge: add and use more tool variables
This patch adds even more customisable variables with tool paths.
Also moves $FILEMERGE where it belongs.
author | Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> |
---|---|
date | Mon, 06 Feb 2006 17:32:00 -0600 |
parents | dca956c9767d |
children | c21b54f7f7b8 74d3f5336b66 |
comparison
equal
deleted
inserted
replaced
1698:ad4a2eefe4d7 | 1699:83e8cd97b9f9 |
---|