Mercurial > hg > mercurial-crew-with-dirclash
log hgmerge @ 329:67c19ad374a9
age | author | description |
---|---|---|
Fri, 10 Jun 2005 09:36:38 -0800 | mpm | Merge with TAH |
Fri, 10 Jun 2005 07:52:39 +0100 | Thomas Arendsen Hein | Use vi if $EDITOR is unset. |
Fri, 10 Jun 2005 07:50:20 +0100 | Thomas Arendsen Hein | Check if $DISPLAY is set before using tkdiff or kdiff3. |
Wed, 08 Jun 2005 10:52:01 -0800 | mpm | Mark the usual things executable |
Fri, 03 Jun 2005 18:42:53 -0800 | mpm | hgmerge: use diff3 if available |
Fri, 03 Jun 2005 18:27:55 -0800 | mpm | Replace tkmerge with hgmerge |