[Monotone-commits-diffs] Revision 9f20e15099d3610a1c2dd78ed1dc1f284c4a64ad

[monotone]

-----------------------------------------------------------------
Revision: 9f20e15099d3610a1c2dd78ed1dc1f284c4a64ad
Ancestor: 6823846e05751985cbb59d93af94f7a19f7a89d8
Author: address@hidden
Date: 2008-05-11T04:36:14
Branch: net.venge.monotone.mark-merge-existence

Modified files:
        cmd_merging.cc merge.cc roster_merge.cc roster_merge.hh

ChangeLog: 

 * Pass the database reference into roster_merge() and uncomment the code
   that looks for marks in the uncommon ancestors of the dead side.

txtXdt5AaeXg6.txt
Description: Diff [6823846e05751985cbb59d93af94f7a19f7a89d8] -> [9f20e15099d3610a1c2dd78ed1dc1f284c4a64ad]