Mercurial > hg > mercurial-crew-with-dirclash
log hgmerge @ 1710:c65113f3627a
age | author | description |
---|---|---|
Mon, 06 Feb 2006 17:32:10 -0600 | Radoslaw Szkodzinski | hgmerge: various cleanups |
Mon, 06 Feb 2006 17:32:06 -0600 | Radoslaw Szkodzinski | hgmerge: add cleanup functions |
Mon, 06 Feb 2006 17:32:00 -0600 | Radoslaw Szkodzinski | hgmerge: add and use more tool variables |
Mon, 30 Jan 2006 12:02:12 +1300 | Brendan Cully | Safer version of FileMerge merge |
Sun, 29 Jan 2006 10:10:00 +1300 | Christian Ebert | Use of opendiff as merge program on MacOS X |
Mon, 24 Oct 2005 14:55:53 -0700 | levon | Fix use of diff(1) triggered by set -e. |