merge-recursive: refuse to merge binary files

diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index 7658fbdaef7ed0e9240630e5927ba936df95ffd0..f3387f5d09959c1e94cb2e140d5ccc617b45ebb1 100644 (file)
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -13,7 +13,6 @@ SYNOPSIS
          [--3way] [--interactive] [--binary]
          [--whitespace=<option>] [-C<n>] [-p<n>]
          <mbox>|<Maildir>...
-
 'git-am' [--skip | --resolved]
 
 DESCRIPTION