Merge branch 'jm/mergetool-pathspec'
* jm/mergetool-pathspec: mergetool: no longer need to save standard input mergetool: Use args as pathspec to unmerged files
Junio C Hamano committed
Oct 10, 2011 at 15:56 UTC
5fbdb9c2e8cc7226d9a9e7de5ad09ac5f0a0b906
No changes.