From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 26 Oct 2011 23:12:25 +0000 (-0700)
Subject: Merge branch 'jm/mergetool-pathspec' into maint-1.7.6
X-Git-Tag: v1.7.6.5~9
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/87d99c64dfa8880592104245896557aa530d4fd9

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
---

87d99c64dfa8880592104245896557aa530d4fd9