commit | 5fbdb9c2e8cc7226d9a9e7de5ad09ac5f0a0b906 | [log] [tgz] |
---|---|---|
author | Junio C Hamano <gitster@pobox.com> | Mon Oct 10 15:56:18 2011 -0700 |
committer | Junio C Hamano <gitster@pobox.com> | Mon Oct 10 15:56:18 2011 -0700 |
tree | 76972a1c5eebdc2ade46704ac95b04c712e5321b | |
parent | 7ddd582402aa926d5ec33d914ccc8bfaf1b15c06 [diff] | |
parent | 6d9990a959c0168ab6dfe75236980f95ac512ce5 [diff] |
Merge branch 'jm/mergetool-pathspec' * jm/mergetool-pathspec: mergetool: no longer need to save standard input mergetool: Use args as pathspec to unmerged files