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

[Monotone-commits-diffs] Revision 3f92a8c416b5db7b6ea3a4e9c75e188c66f790

From: monotone
Subject: [Monotone-commits-diffs] Revision 3f92a8c416b5db7b6ea3a4e9c75e188c66f79066
Date: Mon, 23 Jan 2006 11:05:27 +0100 
-----------------------------------------------------------------
Revision: 3f92a8c416b5db7b6ea3a4e9c75e188c66f79066
Ancestor: f7d24864f09f75ffe44a28210db85cc4dc83e17c
Author: address@hidden
Date: 2006-01-23T08:49:40
Branch: net.venge.monotone.root-dir-rename

Modified files:
        roster_merge.cc roster_merge.hh

ChangeLog: 

add slots to describe new possible conflict types

Attachment: txtQAVQjvsdk2.txt
Description: Diff [f7d24864f09f75ffe44a28210db85cc4dc83e17c] -> [3f92a8c416b5db7b6ea3a4e9c75e188c66f79066]

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