[Monotone-commits-nodiffs] Revision abeb35423c0de5a15774dbb2ef6a45536acf9bc8

[monotone]

-----------------------------------------------------------------
Revision: abeb35423c0de5a15774dbb2ef6a45536acf9bc8
Ancestor: 250d0cd624cc1d2df00424ae792fdcea1d203a88
Author: address@hidden
Date: 2008-05-10T08:10:35
Branch: net.venge.monotone.mark-merge-existence

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

ChangeLog: 

Clean up mark code (removing excess stuff I don't think I'll need any more).
Add node_existance_conflicts.


monotone --db={your.database} diff 
--revision=250d0cd624cc1d2df00424ae792fdcea1d203a88 
--revision=abeb35423c0de5a15774dbb2ef6a45536acf9bc8
----------------------------------------------------------------------