Re: [Monotone-devel] ikiwiki monotone support

[Brian May]

>>>>> "Brian" == Brian May <address@hidden> writes:

    Brian> -              "--label", string.format("[Yours]",     tbl.left_path 
),
    Brian> -              "--label", string.format("[Original]",  tbl.anc_path  
),
    Brian> -              "--label", string.format("[Theirs]",    
tbl.right_path),

These labels have changed:

        local diff3 = {
            "diff3",
            "--merge",
            "--label", string.format("%s [left]",     tbl.left_path ),
            "--label", string.format("%s [ancestor]", tbl.anc_path  ),
            "--label", string.format("%s [right]",    tbl.right_path),
        }

Oh well, I think it is worth the code simplification.
-- 
Brian May <address@hidden>