[Monotone-commits-nodiffs] Revision 8d484bdf3063bc274d833bd7442af2a35c9966c5

[monotone]

-----------------------------------------------------------------
Revision: 8d484bdf3063bc274d833bd7442af2a35c9966c5
Ancestor: a84c65dde4a7ecde295740450ac6e3e7484394c7
Author: address@hidden
Date: 03/27/10 13:08:08
Branch: net.venge.monotone

Modified files:
        monotone.texi
        tests/move_conflicting_unversioned/__driver__.lua work.cc

ChangeLog: 

add summary message for --move-conflicting-paths

* monotone.texi (Workspace Collisions): fix path used by 
--move-conflicting-paths

* tests/move_conflicting_unversioned/__driver__.lua: test summary message for 
--move-conflicting-paths

* work.cc (perform_content_update): add summary message for 
--move-conflicting-paths


monotone --db={your.database} diff 
--revision=a84c65dde4a7ecde295740450ac6e3e7484394c7 
--revision=8d484bdf3063bc274d833bd7442af2a35c9966c5
----------------------------------------------------------------------