Refactor merge strategies into separate includable file.

diff --git a/usage.c b/usage.c
index e774d2ef32726af0707d817cdb63fc8751ddc9d8..dfa87fe1191862b2c650e55fdd727802ef00cf34 100644 (file)
--- a/usage.c
+++ b/usage.c
@@ -3,7 +3,6 @@
  *
  * Copyright (C) Linus Torvalds, 2005
  */
-#include <stdarg.h>
 #include "cache.h"
 
 static void report(const char *prefix, const char *err, va_list params)
@@ -16,7 +15,7 @@ static void report(const char *prefix, const char *err, va_list params)
 void usage(const char *err)
 {
        fprintf(stderr, "usage: %s\n", err);
-       exit(1);
+       exit(129);
 }
 
 void die(const char *err, ...)
@@ -26,7 +25,7 @@ void die(const char *err, ...)
        va_start(params, err);
        report("fatal: ", err, params);
        va_end(params);
-       exit(1);
+       exit(128);
 }
 
 int error(const char *err, ...)