[Monotone-commits-diffs] Revision 5bb9142d2928524904e0e9e004dccbe80b1302a3

[monotone]

-----------------------------------------------------------------
Revision: 5bb9142d2928524904e0e9e004dccbe80b1302a3
Ancestor: 41934d84cde2322f36cc76c1527c5dac67319216
Ancestor: 573cfc15c40bee71ad016af7f2080a9f31fb533f
Author: address@hidden
Date: 2006-07-11T21:59:00
Branch: net.venge.monotone.multihead

Added files:
        tests/diff_output_formats/A.cdp
        tests/diff_output_formats/A.udp
        tests/diff_output_formats/B.cdp
        tests/diff_output_formats/B.udp
        tests/diff_output_formats/C.cdp
        tests/diff_output_formats/C.udp
        tests/diff_output_formats/D.cdp
        tests/diff_output_formats/D.udp
        tests/diff_output_formats/E.cdp
        tests/diff_output_formats/E.udp
        tests/diff_output_formats/F.cdp
        tests/diff_output_formats/F.udp
        tests/diff_output_formats/G.cdp
        tests/diff_output_formats/G.udp
        tests/diff_output_formats/H.cdp
        tests/diff_output_formats/H.udp
        tests/diff_output_formats/I.cdp
        tests/diff_output_formats/I.udp
        tests/diff_output_formats/J.cdp
        tests/diff_output_formats/J.udp
        tests/diff_output_formats/hello.cdp
        tests/diff_output_formats/hello.udp
        tests/merge_multiple_heads_1/__driver__.lua
Added directories:
        tests/merge_multiple_heads_1
Modified files:
        ChangeLog app_state.cc app_state.hh cmd_diff_log.cc
        cmd_files.cc cmd_merging.cc diff_patch.cc diff_patch.hh
        lua_hooks.cc lua_hooks.hh monotone.cc monotone.texi
        options.hh po/sv.po std_hooks.lua
        tests/diff_output_formats/__driver__.lua
        tests/test_hooks.lua testsuite.lua

ChangeLog: 

propagate from branch 'net.venge.monotone' (head 
573cfc15c40bee71ad016af7f2080a9f31fb533f)
            to branch 'net.venge.monotone.multihead' (head 
41934d84cde2322f36cc76c1527c5dac67319216)


monotone --db={your.database} diff 
--revision=41934d84cde2322f36cc76c1527c5dac67319216 
--revision=5bb9142d2928524904e0e9e004dccbe80b1302a3
monotone --db={your.database} diff 
--revision=573cfc15c40bee71ad016af7f2080a9f31fb533f 
--revision=5bb9142d2928524904e0e9e004dccbe80b1302a3
----------------------------------------------------------------------