[Monotone-commits-diffs] Revision 2cfed4124b9c069d96759daa3d5317a887ecffb5

[monotone]

-----------------------------------------------------------------
Revision: 2cfed4124b9c069d96759daa3d5317a887ecffb5
Ancestor: 465ec6239f6c327b5fe40f36888bf289fba88936
Author: Ralf S. Engelschall <address@hidden>
Date: 2007-09-23T07:40:26
Branch: net.venge.monotone

Modified files:
        std_hooks.lua

ChangeLog: 

diff3 return 0 on no conflicts (should not happen in this context) and 1 on 
conflicts (which is what we expect here) and 2 on error, so fail on 2 only; 
additionally require diff(1) in PATH for sdiff(1) call

txtqSiSdSiFZb.txt
Description: Diff [465ec6239f6c327b5fe40f36888bf289fba88936] -> [2cfed4124b9c069d96759daa3d5317a887ecffb5]