Merge branch 'jk/merge-file-exit-code'
[git/git.git] / builtin / merge-file.c
index 50d0bc8..5544705 100644 (file)
@@ -104,5 +104,8 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix)
                free(result.ptr);
        }
 
+       if (ret > 127)
+               ret = 127;
+
        return ret;
 }