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

[Monotone-commits-diffs] Revision 6e6461b6706fb37704d361feb8dfb6c461bef0

From: monotone
Subject: [Monotone-commits-diffs] Revision 6e6461b6706fb37704d361feb8dfb6c461bef02f
Date: Thu, 6 Jul 2006 02:08:31 +0200 
-----------------------------------------------------------------
Revision: 6e6461b6706fb37704d361feb8dfb6c461bef02f
Ancestor: 00cf1061e7d9bd630c12cb26f2dc1ef09d350d4b
Author: Timothy Brownawell  <address@hidden>
Date: 2006-07-05T23:54:36
Branch: net.venge.monotone

Added files:
        tests/merge_conflict_with_no_lca/__driver__.lua
        tests/merge_conflict_with_no_lca/rcfile
Added directories:
        tests/merge_conflict_with_no_lca
Modified files:
        ChangeLog testsuite.lua

ChangeLog: 

2006-07-05  Timothy Brownawell  <address@hidden>
        * tests/merge_conflict_with_no_lca: We don't want to crash when
        a merge has a content conflict but no lca.

Attachment: txtiyMf5FXM1Y.txt
Description: Diff [00cf1061e7d9bd630c12cb26f2dc1ef09d350d4b] -> [6e6461b6706fb37704d361feb8dfb6c461bef02f]

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