X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=merge-index.c;h=fa719cb0b1bd227423587c9e41eed77c755465a4;hb=e098368b5b990eb05cbc60a271ab6d731820e0c2;hp=5599fd321bb4c09c1c0ce4fc62dfb9ecf5531c2b;hpb=070739fd351702ea9bb4f65595728ae25a488075;p=git.git

diff --git a/merge-index.c b/merge-index.c
index 5599fd321..fa719cb0b 100644
--- 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;