From 0e5dfc2689e9060c893c0e4c06bd5a7b86ff0e0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= <jn.avila@free.fr>
Date: Thu, 3 Jan 2019 18:55:00 +0100
Subject: [PATCH] Merge changes in original manpages

---
 en/git-add.txt          | 4 ++--
 en/git-am.txt           | 1 -
 en/mergetools-merge.txt | 1 +
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/en/git-add.txt b/en/git-add.txt
index fb8d7fa..c2b5ce9 100644
--- a/en/git-add.txt
+++ b/en/git-add.txt
@@ -58,7 +58,7 @@ OPTIONS
 	specifying `dir` will record not just a file `dir/file1`
 	modified in the working tree, a file `dir/file2` added to
 	the working tree, but also a file `dir/file3` removed from
-	the working tree).  Note that older versions of Git used
+	the working tree). Note that older versions of Git used
 	to ignore removed files; use `--no-all` option if you want
 	to add modified or new files but ignore removed ones.
 
@@ -189,7 +189,7 @@ EXAMPLES
 --------
 
 * Adds content from all `*.txt` files under `Documentation` directory
-and its subdirectories:
+  and its subdirectories:
 +
 ------------
 $ git add Documentation/\*.txt
diff --git a/en/git-am.txt b/en/git-am.txt
index 52a5225..12879e4 100644
--- a/en/git-am.txt
+++ b/en/git-am.txt
@@ -26,7 +26,6 @@ current branch.
 
 OPTIONS
 -------
-
 (<mbox>|<Maildir>)...::
 	The list of mailbox files to read patches from. If you do not
 	supply this argument, the command reads from the standard input.
diff --git a/en/mergetools-merge.txt b/en/mergetools-merge.txt
index 77c6453..e202f5e 100644
--- a/en/mergetools-merge.txt
+++ b/en/mergetools-merge.txt
@@ -8,6 +8,7 @@
 * ecmerge
 * emerge
 * examdiff
+* guiffy
 * gvimdiff
 * gvimdiff2
 * gvimdiff3
-- 
GitLab