[Monotone-commits-diffs] Revision 1bf7c779e4b4cd3328562a95ccfb51b40005a5e2

[monotone]

-----------------------------------------------------------------
Revision: 1bf7c779e4b4cd3328562a95ccfb51b40005a5e2
Ancestor: 4e9ee37e959be3aa4692d96156adeb75eb15a308
Ancestor: ca8f5a9c49968c38109a4bad6a7d6b823d9d1275
Author: address@hidden
Date: 2007-02-07T19:43:15
Branch: net.venge.monotone.experiment.summit07.lapo-gab

Added files:
        asciik.cc tests/test_a_merge_8/__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
Added directories:
        tests/test_a_merge_8
Modified files:
        ChangeLog po/de.po po/sv.po testsuite.lua
        win32/os_strerror.cc
Modified attrs:
        asciik.cc

ChangeLog: 

merge of '4e9ee37e959be3aa4692d96156adeb75eb15a308'
     and 'ca8f5a9c49968c38109a4bad6a7d6b823d9d1275'


monotone --db={your.database} diff 
--revision=4e9ee37e959be3aa4692d96156adeb75eb15a308 
--revision=1bf7c779e4b4cd3328562a95ccfb51b40005a5e2
monotone --db={your.database} diff 
--revision=ca8f5a9c49968c38109a4bad6a7d6b823d9d1275 
--revision=1bf7c779e4b4cd3328562a95ccfb51b40005a5e2
----------------------------------------------------------------------