[Monotone-commits-diffs] Revision 8fb58caca4fa27408211c789f84c96c881755013

[monotone]

-----------------------------------------------------------------
Revision: 8fb58caca4fa27408211c789f84c96c881755013
Ancestor: db529ea781a463954dbb9e936dede30d3721f113
Author: Ralf S. Engelschall <address@hidden>
Date: 2007-02-04T22:03:44
Branch: net.venge.monotone

Modified files:
        ChangeLog mtn.1 std_hooks.lua

ChangeLog: 

2007-02-04  Ralf S. Engelschall <address@hidden>

        (via Richard Levitte  <address@hidden>)
        * mtn.1: Fix two typos.
        * std_hooks.lua: Add support for a "last resort" merging via GNU
        diffutils' diff3/sdiff (it first shows the 3-way diff via diff3
        and then allows interactive 2-way merging via sdiff -- a little
        bit similar to what the FreeBSD mergemaster script does).

txtuUM2VfPueU.txt
Description: Diff [db529ea781a463954dbb9e936dede30d3721f113] -> [8fb58caca4fa27408211c789f84c96c881755013]