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

[Monotone-commits-diffs] Revision ffb37f03eade31071ca1ff0e40a1aa75b35505

From: monotone
Subject: [Monotone-commits-diffs] Revision ffb37f03eade31071ca1ff0e40a1aa75b3550506
Date: Mon, 21 Nov 2005 05:05:08 UT 
-----------------------------------------------------------------
Revision: ffb37f03eade31071ca1ff0e40a1aa75b3550506
Ancestor: d4595fc2a16b4d81f5c2496f9c8bd5f0338cb210
Author: address@hidden
Date: 2005-11-21T04:45:00
Branch: net.venge.monotone.experiment.rosters

Modified files:
        merge.cc

ChangeLog: 

teach merge.cc about structural conflicts

Attachment: txtQHhHKsWZDP.txt
Description: Diff [d4595fc2a16b4d81f5c2496f9c8bd5f0338cb210] -> [ffb37f03eade31071ca1ff0e40a1aa75b3550506]

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