Mercurial > hg > mercurial-crew-with-dirclash
log hgmerge @ 1664:4338e33c973b
age | author | description |
---|---|---|
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. |
Thu, 04 Aug 2005 13:31:25 -0800 | mpm | Merge with BOS |