[PATCH] Remove an odd "available" from git-mergetool message regarding no merge tools

Alex Riesen· Jun 11, 2007, 09:01 UTC · lore

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
---
 git-mergetool.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

From caf5b63a17003efa53729b71ae314197438acfe8 Mon Sep 17 00:00:00 2001
From: Alex Riesen <raa.lkml@gmail.com>
Date: Mon, 11 Jun 2007 10:54:23 +0200
Subject: [PATCH] Remove an odd "available" from git-mergetool message regarding no merge tools

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
---
 git-mergetool.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Show changes to git-mergetool.sh +1 −1

diff --git a/git-mergetool.sh b/git-mergetool.sh
index 7b66309..3e49168 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -339,7 +339,7 @@ if test -z "$merge_tool" ; then
         fi
     done
     if test -z "$merge_tool" ; then
-	echo "No available merge resolution programs available."
+	echo "No merge resolution programs available."
 	exit 1
     fi
 fi

-- 
1.5.2.1.878.gef42

patchRemove an odd "available" from git-mergetool message regarding no merge tools