From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 10 Oct 2011 22:56:18 +0000 (-0700)
Subject: Merge branch 'jm/mergetool-pathspec'
X-Git-Tag: v1.7.8-rc0~109
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5fbdb9c2e8cc7226d9a9e7de5ad09ac5f0a0b906;p=git.git

Merge branch 'jm/mergetool-pathspec'

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

5fbdb9c2e8cc7226d9a9e7de5ad09ac5f0a0b906