git-svnimport: Improved detection of merges.

diff --git a/builtin-log.c b/builtin-log.c
index cdcf49e21ff72b8422c12e32c1b6fddeed77ba08..db1912a05be425d1f4430aafee5f2bca844dd104 100644 (file)
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -203,7 +203,7 @@ int cmd_format_patch(int argc, const char **argv, char **envp)
 
        if (start_number < 0)
                start_number = 1;
-       if (numbered && keep_subject < 0)
+       if (numbered && keep_subject)
                die ("-n and -k are mutually exclusive.");
 
        argc = setup_revisions(argc, argv, &rev, "HEAD");