[Monotone-commits-diffs] Revision a7d7422e6480ff15bf5634ff4def2241bf39e88a

[monotone]

-----------------------------------------------------------------
Revision: a7d7422e6480ff15bf5634ff4def2241bf39e88a
Ancestor: c02c42db213db9441ebb91f090f659feefed9870
Ancestor: cc7f866bbfd2800324dbb7ff3781a614c4615f19
Author: address@hidden
Date: 2008-02-11T14:08:17
Branch: net.venge.monotone

Added files:
        tests/imp_test_filesync_confdir/__driver__.lua
        tests/merge_update_part_of_file/__driver__.lua
        tests/merge_update_part_of_file/after.diff
        tests/merge_update_part_of_file/before.diff
        tests/merge_update_part_of_file/onechange
        tests/merge_update_part_of_file/original
        tests/merge_update_part_of_file/twochanges
        tests/update_with_pending_modification/__driver__.lua
Added directories:
        tests/imp_test_filesync_confdir
        tests/merge_update_part_of_file
        tests/update_with_pending_modification
Modified files:
        po/de.po po/es.po po/it.po tests/test_hooks.lua

ChangeLog: 

merge of 'c02c42db213db9441ebb91f090f659feefed9870'
     and 'cc7f866bbfd2800324dbb7ff3781a614c4615f19'


monotone --db={your.database} diff 
--revision=c02c42db213db9441ebb91f090f659feefed9870 
--revision=a7d7422e6480ff15bf5634ff4def2241bf39e88a
monotone --db={your.database} diff 
--revision=cc7f866bbfd2800324dbb7ff3781a614c4615f19 
--revision=a7d7422e6480ff15bf5634ff4def2241bf39e88a
----------------------------------------------------------------------