[Monotone-commits-diffs] Revision 961aa64543e589fa824718f6ccf98447a184af67

[monotone]

-----------------------------------------------------------------
Revision: 961aa64543e589fa824718f6ccf98447a184af67
Ancestor: c415140f6b87e7724f9a9904decdc6f545835c26
Ancestor: fa72f4d883452e7436663be7fe588b50e71693a0
Author: address@hidden
Date: 2009-08-08T09:48:00
Branch: net.venge.monotone

Added files:
        tests/move_conflicting_unversioned/__driver__.lua
Added directories:
        tests/move_conflicting_unversioned
Modified files:
        INSTALL NEWS cmd_merging.cc cmd_ws_commit.cc monotone.texi
        options_list.hh paths.cc paths.hh win32/README
        win32/monotone.iss work.cc work.hh

ChangeLog: 

propagate from branch 'net.venge.monotone.experiment.remove_leftover_files' 
(head fa72f4d883452e7436663be7fe588b50e71693a0)
            to branch 'net.venge.monotone' (head 
c415140f6b87e7724f9a9904decdc6f545835c26)


monotone --db={your.database} diff 
--revision=c415140f6b87e7724f9a9904decdc6f545835c26 
--revision=961aa64543e589fa824718f6ccf98447a184af67
monotone --db={your.database} diff 
--revision=fa72f4d883452e7436663be7fe588b50e71693a0 
--revision=961aa64543e589fa824718f6ccf98447a184af67
----------------------------------------------------------------------