Try to find the optimum merge base while resolving.

diff --git a/ssh-push.c b/ssh-push.c
index aac70af514e0dc5507fa4997ebad54352c973215..ee424a8712fad002f0a6962c3b7067fe25aed91a 100644 (file)
--- a/ssh-push.c
+++ b/ssh-push.c
@@ -96,7 +96,7 @@ static void service(int fd_in, int fd_out) {
        } while (1);
 }
 
-static const char *ssh_push_usage =
+static const char ssh_push_usage[] =
        "git-ssh-push [-c] [-t] [-a] [-w ref] commit-id url";
 
 int main(int argc, char **argv)