[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-nodiffs] Revision a4e61161114ba1223d7b993146a6e47fd8fd
From: |
monotone |
Subject: |
[Monotone-commits-nodiffs] Revision a4e61161114ba1223d7b993146a6e47fd8fd9702 |
Date: |
Mon, 22 Aug 2005 22:05:17 UT |
-----------------------------------------------------------------
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.
monotone --db={your.database} diff
--revision=be7245628596d60b293d6826a36f9f9f2f751f59
--revision=a4e61161114ba1223d7b993146a6e47fd8fd9702
----------------------------------------------------------------------
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-nodiffs] Revision a4e61161114ba1223d7b993146a6e47fd8fd9702,
monotone <=