-----------------------------------------------------------------
Revision: 13f096de421cce3873c182bab60acc25aaeaa34a
Ancestor: ea5009257df6295efbdc68215b30de3664e84a92
Author: [EMAIL PROTECTED]
Date: 2008-10-15T14:27:37
Branch: net.venge.monotone.resolve_conflicts
Modified files:
cmd_merging.cc
tests/resolve_conflicts_duplicate_name/__driver__.lua
tests/resolve_conflicts_propagate/__driver__.lua
ChangeLog:
add support for message options on merge commands.
* cmd_merging.cc (merge_two, CMD(merge), CMD(propagate)):
(CMD(merge_into_dir), CMD(explicit_merge)): add support for message
options.
* tests/resolve_conflicts_duplicate_name/__driver__.lua: test --message
option on merge.
* tests/resolve_conflicts_propagate/__driver__.lua: test --message option
on propagate.
monotone --db={your.database} diff
--revision=ea5009257df6295efbdc68215b30de3664e84a92
--revision=13f096de421cce3873c182bab60acc25aaeaa34a
----------------------------------------------------------------------
_______________________________________________
Monotone-commits-nodiffs mailing list
[email protected]
http://lists.nongnu.org/mailman/listinfo/monotone-commits-nodiffs
