X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=ll-merge.c;h=2d6b6d6cb1d2bc2d334bf058feb3444e94b5a781;hb=3d913526b19545eb4e463f96d2f3b8db8daae6ef;hp=0571564ddfb336247c8268fbdecd8674d8bacd3e;hpb=1d4bf0b362bbe26f6a8b6e8e278cd45986de4aeb;p=git.git diff --git a/ll-merge.c b/ll-merge.c index 0571564dd..2d6b6d6cb 100644 --- a/ll-merge.c +++ b/ll-merge.c @@ -192,10 +192,6 @@ static int ll_ext_merge(const struct ll_merge_driver *fn, args[2] = cmd.buf; status = run_command_v_opt(args, 0); - if (status < -ERR_RUN_COMMAND_FORK) - ; /* failure in run-command */ - else - status = -status; fd = open(temp[1], O_RDONLY); if (fd < 0) goto bad;