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

[Monotone-commits-diffs] Revision feef79b5d0b098b8fc7c071fe57d111dd281e9

From: monotone
Subject: [Monotone-commits-diffs] Revision feef79b5d0b098b8fc7c071fe57d111dd281e9f4
Date: Sun, 18 Jul 2010 18:30:54 +0200 
-----------------------------------------------------------------
Revision: feef79b5d0b098b8fc7c071fe57d111dd281e9f4
Ancestor: 8627dfd597812d2e498adfd6a5a79486e0071453
Author: address@hidden
Date: 07/18/10 18:22:45
Branch: net.venge.monotone

Modified files:
        cmd_merging.cc tests/resolve_conflicts_errors/__driver__.lua

ChangeLog: 

Fix bug 30473

* cmd_merging.cc (CMD(store, conflicts)): explicitly check for workspace. Fixes 
bug 30473

* tests/resolve_conflicts_errors/__driver__.lua: test fix

Attachment: txtVOa3marf0D.txt
Description: Diff [8627dfd597812d2e498adfd6a5a79486e0071453] -> [feef79b5d0b098b8fc7c071fe57d111dd281e9f4]

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