[Monotone-commits-diffs] Revision cf53c8841e58c735b4bc22d13b7756b96d5f2c15

[monotone]

-----------------------------------------------------------------
Revision: cf53c8841e58c735b4bc22d13b7756b96d5f2c15
Ancestor: d0f254807c3cbbed646a8cfbf9e8f0b5f830be3c
Author: address@hidden
Date: 2006-05-29T10:56:34
Branch: net.venge.monotone

Modified files:
        ChangeLog std_hooks.lua

ChangeLog: 

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

        * std_hooks.lua (merge3): Check the exit code from the merging
        program to detect failure.  We could do that by strictly checking
        if the output file exists, but since some programs, like meld,
        don't produce a specific output file, that method is unsafe.

txtOzVfLl9ajO.txt
Description: Diff [d0f254807c3cbbed646a8cfbf9e8f0b5f830be3c] -> [cf53c8841e58c735b4bc22d13b7756b96d5f2c15]