[PATCH 0/2] Simple default fixes for v2.0

I don't see why people need to set these to have sensible behavior:

  merge.defaulttoupstream = true
  mergetool.prompt = false

Let's change them to sane defaults so they are not needed.

Felipe Contreras (2):
  merge: enable defaulttoupstream by default
  mergetool: run prompt only if guessed tool

 Documentation/git-merge.txt |  5 ++---
 builtin/merge.c             |  2 +-
 git-mergetool.sh            | 14 +++++++++++---
 3 files changed, 14 insertions(+), 7 deletions(-)