[Monotone-commits-nodiffs] Revision b96c334282bfec68e266931213d5c7c22f6ad6af

[monotone]

-----------------------------------------------------------------
Revision: b96c334282bfec68e266931213d5c7c22f6ad6af
Ancestor: aa52f9f8033136b315ee9257ee6ca0dd1a37d998
Ancestor: abeb35423c0de5a15774dbb2ef6a45536acf9bc8
Author: address@hidden
Date: 2008-05-10T12:37:16
Branch: net.venge.monotone.mark-merge-existence

Modified files:
        basic_io.hh cmd_merging.cc lru_writeback_cache.hh merge.cc
        netsync.cc roster.cc roster.hh roster_merge.cc
        roster_merge.hh

ChangeLog: 

propagate from branch 'net.venge.monotone' (head 
aa52f9f8033136b315ee9257ee6ca0dd1a37d998)
            to branch 'net.venge.monotone.mark-merge-existence' (head 
abeb35423c0de5a15774dbb2ef6a45536acf9bc8)


monotone --db={your.database} diff 
--revision=aa52f9f8033136b315ee9257ee6ca0dd1a37d998 
--revision=b96c334282bfec68e266931213d5c7c22f6ad6af
monotone --db={your.database} diff 
--revision=abeb35423c0de5a15774dbb2ef6a45536acf9bc8 
--revision=b96c334282bfec68e266931213d5c7c22f6ad6af
----------------------------------------------------------------------