[Monotone-commits-nodiffs] Revision da31a68b394022b3292483bffde58e9885719ae7

[monotone]

-----------------------------------------------------------------
Revision: da31a68b394022b3292483bffde58e9885719ae7
Ancestor: bd6a5b0d12dbbd7197b38baebd03986f18dc910b
Author: address@hidden
Date: 2008-03-27T21:38:02
Branch: net.venge.monotone

Added files:
        tests/merge_with_conflicting_name_and_renamed_dir/__driver__.lua
Added directories:
        tests/merge_with_conflicting_name_and_renamed_dir

ChangeLog: 

 * tests/merge_with_conflicting_name_and_renamed_dir/__driver__.lua:
   added test, per bug report from Marcin W. Dąbrowski: merging of
   files with conflicting names, in presence of a renamed parent
   directory.


monotone --db={your.database} diff 
--revision=bd6a5b0d12dbbd7197b38baebd03986f18dc910b 
--revision=da31a68b394022b3292483bffde58e9885719ae7
----------------------------------------------------------------------