diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-10-10 15:56:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-10 15:56:18 -0700 |
| commit | 5fbdb9c2e8cc7226d9a9e7de5ad09ac5f0a0b906 (patch) | |
| tree | 76972a1c5eebdc2ade46704ac95b04c712e5321b /notes.c | |
| parent | 7ddd582402aa926d5ec33d914ccc8bfaf1b15c06 (diff) | |
| parent | 6d9990a959c0168ab6dfe75236980f95ac512ce5 (diff) | |
| download | git-5fbdb9c2e8cc7226d9a9e7de5ad09ac5f0a0b906.tar.gz git-5fbdb9c2e8cc7226d9a9e7de5ad09ac5f0a0b906.tar.xz | |
Merge branch 'jm/mergetool-pathspec'
* jm/mergetool-pathspec:
mergetool: no longer need to save standard input
mergetool: Use args as pathspec to unmerged files
Diffstat (limited to 'notes.c')
0 files changed, 0 insertions, 0 deletions