diff --relative: output paths as relative to the current subdirectory

[git.git] / merge-recursive.c

diff --git a/merge-recursive.c b/merge-recursive.c
index b34177d20f1cbbaefd232f070e1f72c677f4eafe..c292a77a81d137a3ee73111162c9aa515c975d70 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -1753,7 +1753,7 @@ int main(int argc, char *argv[])
 
        if (active_cache_changed &&
            (write_cache(index_fd, active_cache, active_nr) ||
-            close(index_fd) || commit_locked_index(lock)))
+            commit_locked_index(lock)))
                        die ("unable to write %s", get_index_file());
 
        return clean ? 0: 1;