Merge changes in original manpages

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

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.

en/mergetools-merge.txt

@@ -8,6 +8,7 @@
 * ecmerge
 * emerge
 * examdiff
+* guiffy
 * gvimdiff
 * gvimdiff2
 * gvimdiff3