diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-02-05 14:54:15 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-02-05 14:54:15 -0800 |
commit | 0244713db17523700e97dd3573c819b51cccbcda (patch) | |
tree | 1e6f9c414a6527a66f9f9e9450b692e88f2f5395 /git-merge-resolve.sh | |
parent | Merge branch 'jk/list-tag-2.7-regression' into maint (diff) | |
parent | git-svn: fix auth parameter handling on SVN 1.9.0+ (diff) | |
download | tgif-0244713db17523700e97dd3573c819b51cccbcda.tar.xz |
Merge branch 'ew/svn-1.9.0-auth' into maint
* ew/svn-1.9.0-auth:
git-svn: fix auth parameter handling on SVN 1.9.0+
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions