[Monotone-commits-nodiffs] Revision 2985fbb7e74c055a5eb7b485afdad50add405318

[monotone]

-----------------------------------------------------------------
Revision: 2985fbb7e74c055a5eb7b485afdad50add405318
Ancestor: 0b134fc6141f11b7d11ede0d6bc61ac94cc024ae
Author: address@hidden
Date: 2005-05-02T11:06:58
Branch: net.venge.monotone

Modified files:
        ChangeLog diff_patch.cc tests/t_merge_6.at

ChangeLog: 

        * diff_patch.cc (normalize_extents): broaden the condition when
        changes can be normalised.
        * tests/t_merge_6.at: now passes.


monotone --db={your.database} diff 
--revision=0b134fc6141f11b7d11ede0d6bc61ac94cc024ae 
--revision=2985fbb7e74c055a5eb7b485afdad50add405318
----------------------------------------------------------------------