Add git-mergetool to run an appropriate merge conflict resolution program

diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt
index 883c1bb0a638d97278cdb66e288bc766a32626af..378e72f38f37eef50135c3907ccd605652f4fd96 100644 (file)
--- a/Documentation/diff-format.txt
+++ b/Documentation/diff-format.txt
@@ -159,7 +159,7 @@ or like this (when '--cc' option is used):
        deleted file mode <mode>,<mode>
 +
 The `mode <mode>,<mode>..<mode>` line appears only if at least one of
-the <mode> is diferent from the rest. Extended headers with
+the <mode> is different from the rest. Extended headers with
 information about detected contents movement (renames and
 copying detection) are designed to work with diff of two
 <tree-ish> and are not used by combined diff format.