[Monotone-commits-diffs] Revision b5b64094b72a8ab38539b9a7a8bb75cf321a788d

[monotone]

-----------------------------------------------------------------
Revision: b5b64094b72a8ab38539b9a7a8bb75cf321a788d
Ancestor: dc4b1ae910740a9475a568bdcfe3b49489b8d4d4
Author: address@hidden
Date: 2005-08-03T18:59:46
Branch: net.venge.monotone

Modified files:
        ChangeLog std_hooks.lua

ChangeLog: 

2005-08-03  Matthew A. Nicholson  <address@hidden>

        * std_hooks.lua (get_preferred_merge2_command)
        (get_preferred_merge3_command): Provide more information on how to
        use vim as merge tool.

txt6FIh1BfWwj.txt
Description: Diff [dc4b1ae910740a9475a568bdcfe3b49489b8d4d4] -> [b5b64094b72a8ab38539b9a7a8bb75cf321a788d]