Re: [PATCH] merge-recursive: Improve the error message printed when merge(1) isn't found.

> -            [out, code] = runProgram(['merge',
> -                                      '-L', branch1Name + '/' + aPath,
> -                                      '-L', 'orig/' + oPath,
> -                                      '-L', branch2Name + '/' + bPath,
> -                                      src1, orig, src2], returnCode=True)
> +            try:
> +                [out, code] = runProgram(['merge',
> +                                          '-L', branch1Name + '/' + aPath,
> +                                          '-L', 'orig/' + oPath,
> +                                          '-L', branch2Name + '/' + bPath,
> +                                          src1, orig, src2], returnCode=True)
> +            except ProgramError, e:
> +                print >>sys.stderr, e
> +                die("Failed to execute 'merge'. merge(1) is used as the "
> +                    "file-level merge tool. Is 'merge' in your path?")

This has my vote as well.

Thanks for your support,
Roberto Nibali, ratz
-- 
echo 
'[q]sa[ln0=aln256%Pln256/snlbx]sb3135071790101768542287578439snlbxq' | dc
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html