[Monotone-commits-nodiffs] Revision 4414107ba9795428d6fa457355d39d4d040dcfae

[monotone]

-----------------------------------------------------------------
Revision: 4414107ba9795428d6fa457355d39d4d040dcfae
Ancestor: 1a8afa25119c9c88dfd031c7fd834f6f99507ecf
Ancestor: 6ed4f2bff517a429f3b4d17368028cee17cd150d
Author: address@hidden
Date: 2009-01-14T03:21:20
Branch: net.venge.monotone

Added files:
        tests/noop_merge_into_workspace/__driver__.lua
Added directories:
        tests/noop_merge_into_workspace
Modified files:
        Makefile.am cmd_merging.cc database.cc rev_types.hh
        roster.cc

ChangeLog: 

merge of '1a8afa25119c9c88dfd031c7fd834f6f99507ecf'
     and '6ed4f2bff517a429f3b4d17368028cee17cd150d'


monotone --db={your.database} diff 
--revision=1a8afa25119c9c88dfd031c7fd834f6f99507ecf 
--revision=4414107ba9795428d6fa457355d39d4d040dcfae
monotone --db={your.database} diff 
--revision=6ed4f2bff517a429f3b4d17368028cee17cd150d 
--revision=4414107ba9795428d6fa457355d39d4d040dcfae
----------------------------------------------------------------------