monotone-commits-diffs
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Monotone-commits-diffs] Revision abeb35423c0de5a15774dbb2ef6a45536acf9b

From: monotone
Subject: [Monotone-commits-diffs] Revision abeb35423c0de5a15774dbb2ef6a45536acf9bc8
Date: Sat, 10 May 2008 14:47:06 +0200 
-----------------------------------------------------------------
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.

Attachment: txt4530oUXRwL.txt
Description: Diff [250d0cd624cc1d2df00424ae792fdcea1d203a88] -> [abeb35423c0de5a15774dbb2ef6a45536acf9bc8]

reply via email to
[Prev in Thread] Current Thread [Next in Thread]