[Monotone-commits-nodiffs] Revision 723ea7d1f9ee830c5bbb92401b9d2cd02ea0f348

[monotone]

-----------------------------------------------------------------
Revision: 723ea7d1f9ee830c5bbb92401b9d2cd02ea0f348
Ancestor: 04500839bae92f1fc60f0014c895d768766df0e4
Author: address@hidden
Date: 2006-05-29T12:14:58
Branch: net.venge.monotone

Modified files:
        ChangeLog std_hooks.lua

ChangeLog: 

2006-05-29  Richard Levitte  <address@hidden>

        * std_hooks.lua (merge3_*_cmd): Make all the merge3 merge helpers
        check the returned exit code of the merge program and generate an
        error message if it fails.
        (execute_confirm): Don't output an error message, that's the
        caller's responsability.
        (merge3): Follow the way the check of exit code is done elsewhere.



monotone --db={your.database} diff 
--revision=04500839bae92f1fc60f0014c895d768766df0e4 
--revision=723ea7d1f9ee830c5bbb92401b9d2cd02ea0f348
----------------------------------------------------------------------