{"thread":{"id":"19085","subject":"[PATCH] mention mergetool in gittutorial","startedAt":"2009-04-27T14:16:16Z","lastAt":"2009-04-27T14:16:16Z","messageCount":1,"participants":["Sitaram Chamarty"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"112418","messageId":"20090427141616.GA10750@atc.tcs.com","threadId":"19085","inReplyTo":null,"subject":"[PATCH] mention mergetool in gittutorial","fromName":"Sitaram Chamarty","fromEmail":"sitaramc@gmail.com","sentAt":"2009-04-27T14:16:16Z","receivedAt":"2009-04-27T14:16:16Z","isPatch":true,"sender":{"key":"sitaramc@gmail.com","avatar":"https://avatars.githubusercontent.com/u/43316?v=4"},"body":"---\n\nThis came up in IRC in some context, and pasky suggested it\nmight be useful to talk about mergetool in the tutorial.\n\n Documentation/gittutorial.txt |   11 +++++++++--\n 1 files changed, 9 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/gittutorial.txt b/Documentation/gittutorial.txt\nindex c5d5596..0d2e75d 100644\n--- a/Documentation/gittutorial.txt\n+++ b/Documentation/gittutorial.txt\n@@ -239,8 +239,15 @@ markers will be left in the problematic files showing the conflict;\n $ git diff\n ------------------------------------------------\n \n-will show this.  Once you've edited the files to resolve the\n-conflicts,\n+will show this.  You can use your normal text editor to resolve the conflicts,\n+or you can use linkgit:git-mergetool[1] to invoke any of a range of popular\n+tools to help you do this.  For example:\n+\n+------------------------------------------------\n+$ git mergetool --tool=meld\n+------------------------------------------------\n+\n+Once you've edited the files to resolve the conflicts,\n \n ------------------------------------------------\n $ git commit -a\n-- \n1.6.2.4\n"}]}