[Monotone-commits-nodiffs] Revision ad8651c59ed9d887d9c796bb9c44cf379d7abc7d

[monotone]

-----------------------------------------------------------------
Revision: ad8651c59ed9d887d9c796bb9c44cf379d7abc7d
Ancestor: 051095ee6e617b95be67848760e83d0d8d07337c
Author: address@hidden
Date: 2006-03-30T10:31:18
Branch: net.venge.monotone.roster-merge-tests

Modified files:
        roster_merge.cc

ChangeLog: 

Some initial work on mark merge testing.  Write down the cases, and a first
pass at subroutines to run them.  Proofreading _greatly_ appreciated,
there's a chunk of super-high-density coding in here listing all the cases.


monotone --db={your.database} diff 
--revision=051095ee6e617b95be67848760e83d0d8d07337c 
--revision=ad8651c59ed9d887d9c796bb9c44cf379d7abc7d
----------------------------------------------------------------------