-----------------------------------------------------------------
Revision: b2f0ab790ae1d124361edbbe4a60e728566a5039
Ancestor: fd2c1878098b47438dd3fdba59de96c2c1ac8776
Author: [email protected]
Date: 2009-08-11T18:37:55
Branch: net.venge.monotone
Modified files:
tests/move_conflicting_unversioned/__driver__.lua work.cc
ChangeLog:
--move-conflicting-paths: allow existing _MTN/resolutions directory.
* work.cc (move_conflicting_paths_into_bookkeeping):
* tests/move_conflicting_unversioned/__driver__.lua: allow existing
_MTN/resolutions directory.
monotone --db={your.database} diff
--revision=fd2c1878098b47438dd3fdba59de96c2c1ac8776
--revision=b2f0ab790ae1d124361edbbe4a60e728566a5039
----------------------------------------------------------------------
_______________________________________________
Monotone-commits-nodiffs mailing list
[email protected]
http://lists.nongnu.org/mailman/listinfo/monotone-commits-nodiffs
