Merge branch 'master' of git://repo.or.cz/git/fastimport

diff --git a/diff-lib.c b/diff-lib.c
index 07f4e8106a51384d2236b182438472884c300da6..7fb19c7b87fc39cc4515628e8623ccb92fbaa60e 100644 (file)
--- a/diff-lib.c
+++ b/diff-lib.c
@@ -664,7 +664,7 @@ int run_diff_index(struct rev_info *revs, int cached)
        const char *tree_name;
        int match_missing = 0;
 
-       /* 
+       /*
         * Backward compatibility wart - "diff-index -m" does
         * not mean "do not ignore merges", but totally different.
         */