monotone-commits-nodiffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Monotone-commits-nodiffs] Revision e381b9b84259d2f43f239fa2acbd9fa32d1c


From: monotone
Subject: [Monotone-commits-nodiffs] Revision e381b9b84259d2f43f239fa2acbd9fa32d1cf301
Date: Fri, 30 Apr 2010 14:27:23 +0200

-----------------------------------------------------------------
Revision: e381b9b84259d2f43f239fa2acbd9fa32d1cf301
Ancestor: 7360a6c98cb9857efdff0d1dc210e8176ef73218
Author: address@hidden
Date: 2010-04-18 00.00.49
Branch: net.venge.monotone

Modified files:
        NEWS std_hooks.lua

ChangeLog: 

* std_hooks.lua: add support for the diffuse merge tool; make it the default 
when it exists in PATH
* NEWS: note the new merger tool


monotone --db={your.database} diff 
--revision=7360a6c98cb9857efdff0d1dc210e8176ef73218 
--revision=e381b9b84259d2f43f239fa2acbd9fa32d1cf301
----------------------------------------------------------------------




reply via email to

[Prev in Thread] Current Thread [Next in Thread]