[Monotone-commits-diffs] Revision a4e61161114ba1223d7b993146a6e47fd8fd9702

[monotone]

-----------------------------------------------------------------
Revision: a4e61161114ba1223d7b993146a6e47fd8fd9702
Ancestor: be7245628596d60b293d6826a36f9f9f2f751f59
Author: address@hidden
Date: 2005-08-22T21:57:52
Branch: net.venge.monotone.precise-cdv

Modified files:
        ChangeLog change_set.cc lua.cc lua.hh pcdv.cc pcdv.hh
        std_hooks.lua

ChangeLog: 

2005-08-22  Timothy Brownawell  <address@hidden>
        * tree merger: Allow tree conflicts to be resolved by the user.
        New lua hook resolve_path_conflicts.

txtnT8NgmYrl6.txt
Description: Diff [be7245628596d60b293d6826a36f9f9f2f751f59] -> [a4e61161114ba1223d7b993146a6e47fd8fd9702]