pull: check if in unresolved merge state

diff --git a/exec_cmd.c b/exec_cmd.c
index 8ab37b5f74f360abf8ff4d689b4ff4f3d29cf785..e85f0fd8d897f4823a7c765d6b6ef929a15ca679 100644 (file)
--- a/exec_cmd.c
+++ b/exec_cmd.c
@@ -96,7 +96,6 @@ void setup_path(void)
        struct strbuf new_path = STRBUF_INIT;
 
        add_path(&new_path, git_exec_path());
-       add_path(&new_path, argv0_path);
 
        if (old_path)
                strbuf_addstr(&new_path, old_path);