[Monotone-commits-diffs] Revision c17d3f3a5ec96fe0e294b8bcffb53bc465530f7b

[monotone]

-----------------------------------------------------------------
Revision: c17d3f3a5ec96fe0e294b8bcffb53bc465530f7b
Ancestor: 598003d09dcb8002a8fd2d55d56c6d4ac0e243e1
Author: address@hidden
Date: 2008-06-19T06:40:51
Branch: net.venge.monotone.automate_show_conflict

Modified files:
        cmd_merging.cc roster_merge.cc

ChangeLog: 

Improve 'update' use of full tree merge; only one existing lua test failing 
(updating_through_a_pivot_root).

* cmd_merging.cc (CMD update): only use full tree merge if no explicit
  rev given on cmd line.

* roster_merge.cc (parse_resolve_conflicts_opts): Nice error messages for
  unsupported conflict resolutions.

txtQA1df7gq0Y.txt
Description: Diff [598003d09dcb8002a8fd2d55d56c6d4ac0e243e1] -> [c17d3f3a5ec96fe0e294b8bcffb53bc465530f7b]