Merge branch 'jm/mergetool-pathspec' into maint-1.7.6

* jm/mergetool-pathspec:
  mergetool: no longer need to save standard input
  mergetool: Use args as pathspec to unmerged files

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

diff --cc git-mergetool.sh
Simple merge