Mercurial > hg > mercurial-crew-with-dirclash
log hgmerge @ 1647:64a1169c927d
age | author | description |
---|---|---|
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 |
Thu, 04 Aug 2005 13:27:41 -0800 | mpm | Merge with TAH |
Thu, 04 Aug 2005 17:43:05 +0100 | Thomas Arendsen Hein | Cleaned up trap handling: |
Thu, 04 Aug 2005 17:23:31 +0100 | Thomas Arendsen Hein | If rejects are empty after using the editor, merge with diff+patch was ok. |