[Monotone-commits-nodiffs] Revision 3b1063a4df92d0c66ea044b8c9054e77dd45f06f

[monotone]

-----------------------------------------------------------------
Revision: 3b1063a4df92d0c66ea044b8c9054e77dd45f06f
Ancestor: 5e9016a2c3f25123a36d76aa48b42a2a73f4ec8e
Author: address@hidden
Date: 2007-02-06T06:12:31
Branch: net.venge.monotone

Added files:
        tests/test_a_merge_8/__driver__.lua
        tests/test_a_merge_8/correct tests/test_a_merge_8/left
        tests/test_a_merge_8/parent tests/test_a_merge_8/right
Added directories:
        tests/test_a_merge_8
Modified files:
        ChangeLog testsuite.lua

ChangeLog: 

2007-02-05  Markus Schiltknecht  <address@hidden>

        * tests/test_a_merge_8/*:
        * testsuite.lua: Added a merge test case, distilled from a
        failing merge in my PostgreSQL repository.



monotone --db={your.database} diff 
--revision=5e9016a2c3f25123a36d76aa48b42a2a73f4ec8e 
--revision=3b1063a4df92d0c66ea044b8c9054e77dd45f06f
----------------------------------------------------------------------