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

[Monotone-commits-diffs] Revision 1be8a3e631933f8d08a19f4f37c1a3cd97983f

From: monotone
Subject: [Monotone-commits-diffs] Revision 1be8a3e631933f8d08a19f4f37c1a3cd97983f58
Date: Wed, 1 Aug 2007 10:06:30 +0200 
-----------------------------------------------------------------
Revision: 1be8a3e631933f8d08a19f4f37c1a3cd97983f58
Ancestor: b78672c7f625a5875db79b4a27567e751e1103bc
Author: address@hidden
Date: 2007-08-01T07:13:19
Branch: net.venge.monotone

Added files:
        tests/test_a_merge_9/__driver__.lua
        tests/test_a_merge_9/left tests/test_a_merge_9/parent
        tests/test_a_merge_9/right
Added directories:
        tests/test_a_merge_9

ChangeLog: 

A test case for a bug report by Daniel Thompson.  Cleanly merges in mtn
but doesn't cleanly merge in diff3.

Attachment: txt8KZAB5xeIi.txt
Description: Diff [b78672c7f625a5875db79b4a27567e751e1103bc] -> [1be8a3e631933f8d08a19f4f37c1a3cd97983f58]

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