{"thread":{"id":"7956","subject":"[PATCH] Document 'opendiff' value in config.txt and git-mergetool.txt","startedAt":"2007-05-03T18:29:15Z","lastAt":"2007-05-03T18:29:15Z","messageCount":1,"participants":["Arjen Laarhoven"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"40969","messageId":"20070503182915.GA29348@regex.yaph.org","threadId":"7956","inReplyTo":null,"subject":"[PATCH] Document 'opendiff' value in config.txt and git-mergetool.txt","fromName":"Arjen Laarhoven","fromEmail":"arjen@yaph.org","sentAt":"2007-05-03T18:29:15Z","receivedAt":"2007-05-03T18:29:15Z","isPatch":true,"sender":{"key":"arjen@yaph.org","avatar":"https://gravatar.com/avatar/f776c2c0c5ea62d70827b942eb7d95ce85661a3d70bc3f03cf9773815c599c01?d=mp&s=160"},"body":"\nSigned-off-by: Arjen Laarhoven <arjen@yaph.org>\n---\n Documentation/config.txt        |    2 +-\n Documentation/git-mergetool.txt |    2 +-\n 2 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex c257cdf..24f9655 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -520,7 +520,7 @@ merge.summary::\n merge.tool::\n \tControls which merge resolution program is used by\n \tgitlink:git-mergetool[l].  Valid values are: \"kdiff3\", \"tkdiff\",\n-\t\"meld\", \"xxdiff\", \"emerge\", \"vimdiff\"\n+\t\"meld\", \"xxdiff\", \"emerge\", \"vimdiff\", and \"opendiff\"\n \n merge.verbosity::\n \tControls the amount of output shown by the recursive merge\ndiff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt\nindex 34288fe..add01e8 100644\n--- a/Documentation/git-mergetool.txt\n+++ b/Documentation/git-mergetool.txt\n@@ -25,7 +25,7 @@ OPTIONS\n -t or --tool=<tool>::\n \tUse the merge resolution program specified by <tool>.\n \tValid merge tools are:\n-\tkdiff3, tkdiff, meld, xxdiff, emerge, and vimdiff.\n+\tkdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, and opendiff\n +\n If a merge resolution program is not specified, 'git mergetool'\n will use the configuration variable merge.tool.  If the\n-- \n1.5.2.rc1.3.g7a150\n"}]}