-----------------------------------------------------------------
Revision: feef79b5d0b098b8fc7c071fe57d111dd281e9f4
Ancestor: 8627dfd597812d2e498adfd6a5a79486e0071453
Author: [email protected]
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
monotone --db={your.database} diff
--revision=8627dfd597812d2e498adfd6a5a79486e0071453
--revision=feef79b5d0b098b8fc7c071fe57d111dd281e9f4
----------------------------------------------------------------------
_______________________________________________
Monotone-commits-nodiffs mailing list
[email protected]
http://lists.nongnu.org/mailman/listinfo/monotone-commits-nodiffs
