[Monotone-commits-diffs] Revision 4518bd9dce00a867316065750782abd67d895339

[monotone]

-----------------------------------------------------------------
Revision: 4518bd9dce00a867316065750782abd67d895339
Ancestor: 299aa7073f4bd8e4812c19d447d6a6a0622b86a5
Ancestor: 941ca0c2752a096e4035c7366c9588c3a19f418f
Author: Timothy Brownawell  <address@hidden>
Date: 2008-02-04T12:37:41
Branch: net.venge.monotone

Added files:
        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/merge_update_part_of_file
        tests/update_with_pending_modification

ChangeLog: 

merge of '299aa7073f4bd8e4812c19d447d6a6a0622b86a5'
     and '941ca0c2752a096e4035c7366c9588c3a19f418f'


monotone --db={your.database} diff 
--revision=299aa7073f4bd8e4812c19d447d6a6a0622b86a5 
--revision=4518bd9dce00a867316065750782abd67d895339
monotone --db={your.database} diff 
--revision=941ca0c2752a096e4035c7366c9588c3a19f418f 
--revision=4518bd9dce00a867316065750782abd67d895339
----------------------------------------------------------------------