Mercurial > hg > mercurial-crew-with-dirclash
log hgmerge @ 792:49ec802b4a16
age | author | description |
---|---|---|
Thu, 30 Jun 2005 23:28:16 -0800 | mpm | Merge with TAH |
Fri, 01 Jul 2005 07:22:27 +0100 | Thomas Arendsen Hein | Remove bashisms and use /bin/sh instead of /bin/bash. |
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 |