[Monotone-commits-diffs] Revision 085db632e01dd5ff7457c3d3a8917aa82fe7a220

[monotone]

-----------------------------------------------------------------
Revision: 085db632e01dd5ff7457c3d3a8917aa82fe7a220
Ancestor: 359b592fdf647cd6d0ad636fb3a9f5d90e12cbdb
Ancestor: ccbf26c4a8f7fc76083dde20c8cb1078426835ef
Author: address@hidden
Date: 2006-07-08T07:47:53
Branch: net.venge.monotone

Deleted entries:
        tests/(minor)_context_diff
        tests/(minor)_context_diff/__driver__.lua
Added files:
        tests/diff_output_formats/A.cd
        tests/diff_output_formats/A.dst
        tests/diff_output_formats/A.src
        tests/diff_output_formats/A.ud
        tests/diff_output_formats/B.cd
        tests/diff_output_formats/B.dst
        tests/diff_output_formats/B.src
        tests/diff_output_formats/B.ud
        tests/diff_output_formats/C.cd
        tests/diff_output_formats/C.dst
        tests/diff_output_formats/C.src
        tests/diff_output_formats/C.ud
        tests/diff_output_formats/D.cd
        tests/diff_output_formats/D.dst
        tests/diff_output_formats/D.src
        tests/diff_output_formats/D.ud
        tests/diff_output_formats/E.cd
        tests/diff_output_formats/E.dst
        tests/diff_output_formats/E.src
        tests/diff_output_formats/E.ud
        tests/diff_output_formats/F.cd
        tests/diff_output_formats/F.dst
        tests/diff_output_formats/F.src
        tests/diff_output_formats/F.ud
        tests/diff_output_formats/G.cd
        tests/diff_output_formats/G.dst
        tests/diff_output_formats/G.src
        tests/diff_output_formats/G.ud
        tests/diff_output_formats/H.cd
        tests/diff_output_formats/H.dst
        tests/diff_output_formats/H.src
        tests/diff_output_formats/H.ud
        tests/diff_output_formats/I.cd
        tests/diff_output_formats/I.dst
        tests/diff_output_formats/I.src
        tests/diff_output_formats/I.ud
        tests/diff_output_formats/J.cd
        tests/diff_output_formats/J.dst
        tests/diff_output_formats/J.src
        tests/diff_output_formats/J.ud
        tests/diff_output_formats/__driver__.lua
        tests/diff_output_formats/hello.cd
        tests/diff_output_formats/hello.dst
        tests/diff_output_formats/hello.src
        tests/diff_output_formats/hello.ud
        tests/pluck_lifecycle/__driver__.lua
Added directories:
        tests/diff_output_formats tests/pluck_lifecycle
Modified files:
        ChangeLog cmd_diff_log.cc cmd_files.cc cmd_merging.cc
        diff_patch.cc diff_patch.hh lcs.cc testsuite.lua

ChangeLog: 

merge of 359b592fdf647cd6d0ad636fb3a9f5d90e12cbdb
     and ccbf26c4a8f7fc76083dde20c8cb1078426835ef


monotone --db={your.database} diff 
--revision=359b592fdf647cd6d0ad636fb3a9f5d90e12cbdb 
--revision=085db632e01dd5ff7457c3d3a8917aa82fe7a220
monotone --db={your.database} diff 
--revision=ccbf26c4a8f7fc76083dde20c8cb1078426835ef 
--revision=085db632e01dd5ff7457c3d3a8917aa82fe7a220
----------------------------------------------------------------------