From mboxrd@z Thu Jan 1 00:00:00 1970 From: Theodore Ts'o Subject: [PATCH] mergetool: Remove spurious error message if merge.tool config option not set Date: Thu, 29 Mar 2007 11:44:21 -0400 Message-ID: <11751830652803-git-send-email-tytso@mit.edu> References: <11751830653554-git-send-email-tytso@mit.edu> <11751830653871-git-send-email-tytso@mit.edu> <11751830651770-git-send-email-tytso@mit.edu> <11751830653157-git-send-email-tytso@mit.edu> <1175183065710-git-send-email-tytso@mit.edu> <11751830651361-git-send-email-tytso@mit.edu> <11751830654112-git-send-email-tytso@mit.edu> Cc: git@vger.kernel.org, Theodore Ts'o To: Junio C Hamano X-From: git-owner@vger.kernel.org Thu Mar 29 17:45:31 2007 Return-path: Envelope-to: gcvg-git@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1HWwoI-0004BP-N2 for gcvg-git@gmane.org; Thu, 29 Mar 2007 17:45:11 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030238AbXC2Pof (ORCPT ); Thu, 29 Mar 2007 11:44:35 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1030278AbXC2Pof (ORCPT ); Thu, 29 Mar 2007 11:44:35 -0400 Received: from thunk.org ([69.25.196.29]:36588 "EHLO thunker.thunk.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030238AbXC2Poa (ORCPT ); Thu, 29 Mar 2007 11:44:30 -0400 Received: from root (helo=candygram.thunk.org) by thunker.thunk.org with local-esmtps (tls_cipher TLS-1.0:RSA_AES_256_CBC_SHA:32) (Exim 4.50 #1 (Debian)) id 1HWwte-0007J4-9a; Thu, 29 Mar 2007 11:50:42 -0400 Received: from tytso by candygram.thunk.org with local (Exim 4.62) (envelope-from ) id 1HWwnZ-0000xo-I2; Thu, 29 Mar 2007 11:44:25 -0400 X-Mailer: git-send-email 1.5.1.rc2.1.g8afe-dirty In-Reply-To: <11751830654112-git-send-email-tytso@mit.edu> X-SA-Exim-Connect-IP: X-SA-Exim-Mail-From: tytso@thunk.org X-SA-Exim-Scanned: No (on thunker.thunk.org); SAEximRunCond expanded to false Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: Signed-off-by: "Theodore Ts'o" --- git-mergetool.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/git-mergetool.sh b/git-mergetool.sh index aeb32ef..5de2433 100755 --- a/git-mergetool.sh +++ b/git-mergetool.sh @@ -282,7 +282,7 @@ done if test -z "$merge_tool"; then merge_tool=`git-config merge.tool` case "$merge_tool" in - kdiff3 | tkdiff | xxdiff | meld | emerge | vimdiff) + kdiff3 | tkdiff | xxdiff | meld | emerge | vimdiff | "") ;; # happy *) echo >&2 "git config option merge.tool set to unknown tool: $merge_tool" -- 1.5.1.rc2.1.g8afe-dirty