[Monotone-commits-nodiffs] Revision 5078e2485c7c428d00dc62919c4b3e3e5d76c1d7

[monotone]

-----------------------------------------------------------------
Revision: 5078e2485c7c428d00dc62919c4b3e3e5d76c1d7
Ancestor: e53cb5be5ceb43d67688d163019d9015c79f5709
Author: address@hidden
Date: 2008-05-18T17:12:51
Branch: net.venge.monotone

Modified files:
        tests/merge_with_conflicting_name_and_renamed_dir/expected.stdout
        tests/resolve_duplicate_name_conflict/__driver__.lua

ChangeLog: 

Match automate show conflicts format change; two more tests.


monotone --db={your.database} diff 
--revision=e53cb5be5ceb43d67688d163019d9015c79f5709 
--revision=5078e2485c7c428d00dc62919c4b3e3e5d76c1d7
----------------------------------------------------------------------