[Monotone-commits-nodiffs] Revision 576d79ab24903cda57d83e3fb14e947354edd628

[monotone]

-----------------------------------------------------------------
Revision: 576d79ab24903cda57d83e3fb14e947354edd628
Ancestor: 6e6461b6706fb37704d361feb8dfb6c461bef02f
Author: Timothy Brownawell  <address@hidden>
Date: 2006-07-06T00:00:48
Branch: net.venge.monotone

Modified files:
        ChangeLog diff_patch.cc
        tests/merge_conflict_with_no_lca/__driver__.lua

ChangeLog: 

2006-07-05  Timothy Brownawell  <address@hidden>
        * diff-patch.cc: Apply njs's patch to fix crash.
        * tests/merge_conflict_with_no_lca/__driver__.lua: Remove xfail.


monotone --db={your.database} diff 
--revision=6e6461b6706fb37704d361feb8dfb6c461bef02f 
--revision=576d79ab24903cda57d83e3fb14e947354edd628
----------------------------------------------------------------------