Merge branch 'mergetool' of git://repo.or.cz/git/mergetool into maint

diff --git a/mailmap.c b/mailmap.c
index cb567a2832d9f8c784aea388af9144c12eddc7d5..87141670595c50a4fa7b87a12b85ff0e2b7da8af 100644 (file)
--- a/mailmap.c
+++ b/mailmap.c
@@ -89,4 +89,3 @@ int map_email(struct path_list *map, const char *email, char *name, int maxlen)
        }
        return 0;
 }
-