[Monotone-commits-diffs] Revision b58216108bd6f7075718d26a091382ad99f58eb5

[monotone]

-----------------------------------------------------------------
Revision: b58216108bd6f7075718d26a091382ad99f58eb5
Ancestor: afa604dcb0f10c0d4bfec25e1dfef1fd4676df7e
Author: address@hidden
Date: 2005-06-24T07:50:22
Branch: net.venge.monotone

Modified files:
        ChangeLog revision.cc std_hooks.lua

ChangeLog: 

2005-06-24  Nathaniel Smith  <address@hidden>

        * std_hooks.lua (get_preferred_merge2_command)
        (get_preferred_merge3_command): Move meld to the bottom of the
        default merge tool search order.  Also, use xemacs if it appears
        in $EDITOR, otherwise use emacs.
        * revision.cc (check_sane_history): Remove stale comment.

txtyw30iUAtrI.txt
Description: Diff [afa604dcb0f10c0d4bfec25e1dfef1fd4676df7e] -> [b58216108bd6f7075718d26a091382ad99f58eb5]