[Monotone-commits-nodiffs] Revision 617264a1703b879be6daa8e11257add34e30bf94

[monotone]

-----------------------------------------------------------------
Revision: 617264a1703b879be6daa8e11257add34e30bf94
Ancestor: c895fca15fd6bbdadbcd29b2a6bb90a09efd3467
Author: address@hidden
Date: 2006-01-11T03:50:48
Branch: net.venge.monotone

Modified files:
        ChangeLog lua.cc lua.hh

ChangeLog: 

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

        * lua.{cc,hh} (hook_resolve_file_conflict)
        (hook_resolve_dir_conflict): Remove dead code.


monotone --db={your.database} diff 
--revision=c895fca15fd6bbdadbcd29b2a6bb90a09efd3467 
--revision=617264a1703b879be6daa8e11257add34e30bf94
----------------------------------------------------------------------