[Monotone-commits-nodiffs] Revision 26cfbb87b400321bda71277e1d2c0ba1d5e9898f

[monotone]

-----------------------------------------------------------------
Revision: 26cfbb87b400321bda71277e1d2c0ba1d5e9898f
Ancestor: ea53b7c7c556cd2b071fd517084270f1daa20836
Author: address@hidden
Date: 2008-03-05T15:22:24
Branch: net.venge.monotone

Modified files:
        NEWS std_hooks.lua

ChangeLog: 

 * NEWS: Added info about change to vim merger.
 * std_hooks.lua: Modified vim merger to used diff3 to merge non conflict
 changes automatically before executing vimdiff.


monotone --db={your.database} diff 
--revision=ea53b7c7c556cd2b071fd517084270f1daa20836 
--revision=26cfbb87b400321bda71277e1d2c0ba1d5e9898f
----------------------------------------------------------------------