[Monotone-commits-diffs] Revision 08c4757e83822da3ace90ed925610e390cecf9aa

[monotone]

-----------------------------------------------------------------
Revision: 08c4757e83822da3ace90ed925610e390cecf9aa
Ancestor: 82238b5cd8b99a45976d9b59553fdd12c8cfffcc
Ancestor: 8b68240e4190985116ded7ac515c1ef9c027c604
Author: address@hidden
Date: 2007-02-17T11:21:07
Branch: net.venge.monotone

Modified files:
        HACKING botan/ber_dec.cpp cmd_diff_log.cc configure.ac
        contrib/monotone-notify-hookversion.lua
        contrib/monotone-notify.pl monotone.texi po/POTFILES.in
        po/de.po po/it.po po/sv.po rev_height.cc rev_height.hh
        std_hooks.lua tests/import/__driver__.lua
        tests/test_a_merge_8/correct tests/test_a_merge_8/left
        tests/test_a_merge_8/parent tests/test_a_merge_8/right

ChangeLog: 

explicit merge of '82238b5cd8b99a45976d9b59553fdd12c8cfffcc'
              and '8b68240e4190985116ded7ac515c1ef9c027c604'
        to branch 'net.venge.monotone'


monotone --db={your.database} diff 
--revision=82238b5cd8b99a45976d9b59553fdd12c8cfffcc 
--revision=08c4757e83822da3ace90ed925610e390cecf9aa
monotone --db={your.database} diff 
--revision=8b68240e4190985116ded7ac515c1ef9c027c604 
--revision=08c4757e83822da3ace90ed925610e390cecf9aa
----------------------------------------------------------------------