Mercurial > hg > mercurial-crew-with-dirclash
diff doc/hg.1.txt @ 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 | f5e194047f1e |
children | 9b92b71d5dd7 |