{"thread":{"id":"8556","subject":"[PATCH] Remove an odd \"available\" from git-mergetool message regarding no merge tools","startedAt":"2007-06-11T09:01:21Z","lastAt":"2007-06-11T09:01:21Z","messageCount":1,"participants":["Alex Riesen"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"44708","messageId":"81b0412b0706110201s7929c872re4e0bc80dae5e863@mail.gmail.com","threadId":"8556","inReplyTo":null,"subject":"[PATCH] Remove an odd \"available\" from git-mergetool message regarding no merge tools","fromName":"Alex Riesen","fromEmail":"raa.lkml@gmail.com","sentAt":"2007-06-11T09:01:21Z","receivedAt":"2007-06-11T09:01:21Z","isPatch":true,"sender":{"key":"raa.lkml@gmail.com","avatar":"https://avatars.githubusercontent.com/u/324101?v=4"},"body":"Signed-off-by: Alex Riesen <raa.lkml@gmail.com>\n---\n git-mergetool.sh |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\n\nFrom caf5b63a17003efa53729b71ae314197438acfe8 Mon Sep 17 00:00:00 2001\nFrom: Alex Riesen <raa.lkml@gmail.com>\nDate: Mon, 11 Jun 2007 10:54:23 +0200\nSubject: [PATCH] Remove an odd \"available\" from git-mergetool message regarding no merge tools\n\nSigned-off-by: Alex Riesen <raa.lkml@gmail.com>\n---\n git-mergetool.sh |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/git-mergetool.sh b/git-mergetool.sh\nindex 7b66309..3e49168 100755\n--- a/git-mergetool.sh\n+++ b/git-mergetool.sh\n@@ -339,7 +339,7 @@ if test -z \"$merge_tool\" ; then\n         fi\n     done\n     if test -z \"$merge_tool\" ; then\n-\techo \"No available merge resolution programs available.\"\n+\techo \"No merge resolution programs available.\"\n \texit 1\n     fi\n fi\n-- \n1.5.2.1.878.gef42\n\n"}]}