Teach git mergetool to use custom commands defined at config time

diff --git a/remote.c b/remote.c
index 45560d900fec047346fa09c1847ed36b8139da26..7e1937286b1cabec84865c7e07e2635feb8bbc70 100644 (file)
--- a/remote.c
+++ b/remote.c
@@ -593,8 +593,7 @@ void free_refs(struct ref *ref)
        struct ref *next;
        while (ref) {
                next = ref->next;
-               if (ref->peer_ref)
-                       free(ref->peer_ref);
+               free(ref->peer_ref);
                free(ref);
                ref = next;
        }