[Monotone-commits-diffs] Revision 4e9ee37e959be3aa4692d96156adeb75eb15a308

[monotone]

-----------------------------------------------------------------
Revision: 4e9ee37e959be3aa4692d96156adeb75eb15a308
Ancestor: 950f63ff92b50f1fd54a3dc526c5ba4a913c5f40
Ancestor: bce4d86c755a58d740e82d50a6ea92db7856dda4
Author: address@hidden
Date: 2007-02-07T19:41:38
Branch: net.venge.monotone.experiment.summit07.lapo-gab

Added files:
        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 vocab_macros.hh
        win32/os_strerror.cc

ChangeLog: 

propagate from branch 'net.venge.monotone' (head 
950f63ff92b50f1fd54a3dc526c5ba4a913c5f40)
            to branch 'net.venge.monotone.experiment.summit07.lapo-gab' (head 
bce4d86c755a58d740e82d50a6ea92db7856dda4)


monotone --db={your.database} diff 
--revision=950f63ff92b50f1fd54a3dc526c5ba4a913c5f40 
--revision=4e9ee37e959be3aa4692d96156adeb75eb15a308
monotone --db={your.database} diff 
--revision=bce4d86c755a58d740e82d50a6ea92db7856dda4 
--revision=4e9ee37e959be3aa4692d96156adeb75eb15a308
----------------------------------------------------------------------