diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-03-15 10:32:20 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-03-15 10:32:20 -0700 |
commit | a7206ba7f35f0ff4dd800baf57eeaced8deddd23 (patch) | |
tree | 133cd417cde6bda83fd43e5c5272b3f8d40baed8 /git-mergetool--lib.sh | |
parent | e7c1132c0f6efb7584f5c4aef45435cd9c3b89c7 (diff) | |
parent | 62335bbbc747c96636b5ce9917b156304c732eaf (diff) | |
download | git-a7206ba7f35f0ff4dd800baf57eeaced8deddd23.tar.gz git-a7206ba7f35f0ff4dd800baf57eeaced8deddd23.tar.xz |
Merge branch 'svn-glob' of git://bogomips.org/git-svn
* 'svn-glob' of git://bogomips.org/git-svn:
git-svn: shorten glob error message
git-svn: loosen config globs limitations
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions