[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-nodiffs] Revision 6e6461b6706fb37704d361feb8dfb6c461be
From: |
monotone |
Subject: |
[Monotone-commits-nodiffs] Revision 6e6461b6706fb37704d361feb8dfb6c461bef02f |
Date: |
Thu, 6 Jul 2006 02:08:32 +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.
monotone --db={your.database} diff
--revision=00cf1061e7d9bd630c12cb26f2dc1ef09d350d4b
--revision=6e6461b6706fb37704d361feb8dfb6c461bef02f
----------------------------------------------------------------------
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-nodiffs] Revision 6e6461b6706fb37704d361feb8dfb6c461bef02f,
monotone <=