[Monotone-commits-diffs] Revision 37e379bf27ee3008be9a1fb3702cd854f95005e2

[monotone]

-----------------------------------------------------------------
Revision: 37e379bf27ee3008be9a1fb3702cd854f95005e2
Ancestor: d98d4bbc482b77e9491e6f181a2e77672c36b088
Author: address@hidden
Date: 2006-01-11T04:27:09
Branch: net.venge.monotone

Modified files:
        ChangeLog diff_patch.cc lua.cc lua.hh std_hooks.lua

ChangeLog: 

2006-01-10  Nathaniel Smith  <address@hidden>

        * std_hooks.lua: 
        * lua.cc (hook_merge2): 
        * diff_patch.cc (try_to_merge_files): Remove merge2 code, since we
        no longer do merge2's.  (We can always revive it if we add suture
        support.)

txtWdLVhW35WR.txt
Description: Diff [d98d4bbc482b77e9491e6f181a2e77672c36b088] -> [37e379bf27ee3008be9a1fb3702cd854f95005e2]