Merge branch 'ar/commit-cleanup'

diff --git a/merge-index.c b/merge-index.c
index 5599fd321bb4c09c1c0ce4fc62dfb9ecf5531c2b..fa719cb0b1bd227423587c9e41eed77c755465a4 100644 (file)
--- a/merge-index.c
+++ b/merge-index.c
@@ -25,7 +25,7 @@ static void run_program(void)
 static int merge_entry(int pos, const char *path)
 {
        int found;
-       
+
        if (pos >= active_nr)
                die("git-merge-index: %s not in the cache", path);
        arguments[0] = pgm;