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

diff --cc Documentation/config.txt
Simple merge

diff --cc Documentation/git-mergetool.txt
Simple merge

diff --cc git-mergetool.sh
index d4078a6affd9b4c1fa52e6dba0fe6c151fa452dc,f04240dacaba88bfdac49b0e6e14047b1008a956..b2d53752ae49ff2c8323836e2907de584cb1e979
--- 1/git-mergetool.sh
--- 2/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
            ;;
        -*)