monotone-commits-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Monotone-commits-diffs] Revision 8365727b69c02fcb3b468988eb27866c6d20bc


From: monotone
Subject: [Monotone-commits-diffs] Revision 8365727b69c02fcb3b468988eb27866c6d20bc56
Date: Tue, 21 Jul 2009 09:18:30 +0200

-----------------------------------------------------------------
Revision: 8365727b69c02fcb3b468988eb27866c6d20bc56
Ancestor: a9f4a1729c48308fbeb6410eea923ddcd9a50fe4
Author: address@hidden
Date: 2009-07-21T07:12:31
Branch: net.venge.monotone.stephe

Modified files:
        NEWS monotone.texi

ChangeLog: 

'conflict' handles directories, allows 'keep' conflict resolution

* NEWS: doc 'conflict' additions

* monotone.texi: doc 'conflict' additions

Attachment: txtQ2ec_MIwUY.txt
Description: Diff [a9f4a1729c48308fbeb6410eea923ddcd9a50fe4] -> [8365727b69c02fcb3b468988eb27866c6d20bc56]


reply via email to

[Prev in Thread] Current Thread [Next in Thread]