From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 1 Jan 2009 13:48:40 +0000 (-0800)
Subject: Merge branch 'cb/mergetool'
X-Git-Tag: v1.6.2-rc0~201
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3827210b91a7d363ea67bcf0b9c6ee1c91d2f3c5;p=git.git

Merge branch 'cb/mergetool'

* cb/mergetool:
  mergetool: Don't keep temporary merge files unless told to
  mergetool: Add prompt to continue after failing to merge a file
  Add -y/--no-prompt option to mergetool
  Fix some tab/space inconsistencies in git-mergetool.sh
---

3827210b91a7d363ea67bcf0b9c6ee1c91d2f3c5
diff --cc git-mergetool.sh
index d4078a6af,f04240dac..b2d53752a
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@@ -295,8 -305,13 +305,14 @@@ d
  		    shift ;;
  	    esac
  	    ;;
+ 	-y|--no-prompt)
+ 	    prompt=false
+ 	    ;;
+ 	--prompt)
+ 	    prompt=true
+ 	    ;;
  	--)
 +	    shift
  	    break
  	    ;;
  	-*)