[Monotone-commits-diffs] Revision eedfdff8fd16ea76935a143fedb07683434b2dbc

[monotone]

-----------------------------------------------------------------
Revision: eedfdff8fd16ea76935a143fedb07683434b2dbc
Ancestor: 2a743007b09600f60e5900477d1d3285b14e4e41
Author: address@hidden
Date: 2005-04-28T06:57:38
Branch: net.venge.monotone

Added files:
        tests/t_merge_6.at
Modified files:
        ChangeLog testsuite.at

ChangeLog: 

        * tests/t_merge_6.at, testsuite.at: add a new test for the case where
        duplicate lines appear in a file during a merge. This testcase can
        be correctly handled by merge(1).

txt7VeCN3h3q6.txt
Description: Diff [2a743007b09600f60e5900477d1d3285b14e4e41] -> [eedfdff8fd16ea76935a143fedb07683434b2dbc]