diff --git a/en/git-add.txt b/en/git-add.txt
index fb8d7faae36e9749679c8a811b1a1f06a0af41d3..c2b5ce9d1943585487b1ec022c89d41fbceb4959 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 52a52256ea84d5de0f3dac6fbf7568134dab8871..12879e4029a7710e2d78bae476f7ad7d9b0fe830 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 77c64533251b38a348b3d2bba1d04aa4ca9012b1..e202f5e8b2cbd7b3cbf87dd9be0aa958c5249396 100644
--- a/en/mergetools-merge.txt
+++ b/en/mergetools-merge.txt
@@ -8,6 +8,7 @@
 * ecmerge
 * emerge
 * examdiff
+* guiffy
 * gvimdiff
 * gvimdiff2
 * gvimdiff3