[Monotone-commits-diffs] Revision 6a7525531f599b25260f9ee17509084b482982e1

[monotone]

-----------------------------------------------------------------
Revision: 6a7525531f599b25260f9ee17509084b482982e1
Ancestor: 171f409788c7ad5f0ea679448e0d451e065a5268
Author: address@hidden
Date: 04/06/10 10:09:35
Branch: net.venge.monotone.stephe

Modified files:
        cmd_merging.cc merge_content.cc merge_content.hh
        monotone.texi tests/automate_update/__driver__.lua

ChangeLog: 

don't spawn merger when non_interactive.

* merge_content.hh:
* cmd_merging.cc (update): pass app.opts to resolve_merge_conflicts

* merge_content.cc (resolve_merge_conflicts): don't spawn merger when
  non_interactive.

* monotone.texi (change_workspace): improve discussion of reading
  workspace options.
  (includedir): fix typos

* tests/automate_update/__driver__.lua: test non_interactive

txtH3J0bqKNJI.txt
Description: Diff [171f409788c7ad5f0ea679448e0d451e065a5268] -> [6a7525531f599b25260f9ee17509084b482982e1]