diff options
author | Junio C Hamano <gitster@pobox.com> | 2015-06-28 14:51:12 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-06-28 14:51:12 -0700 |
commit | 912bd497e93f0235a5999a77f8d54f5ff80a3a03 (patch) | |
tree | c9878d7328aee0ddeff38cbe7a533da343f47cf0 /mergetools | |
parent | Git 2.5.0-rc0 (diff) | |
parent | Merge branch 'jk/stash-require-clean-index' into maint (diff) | |
download | tgif-912bd497e93f0235a5999a77f8d54f5ff80a3a03.tar.xz |
Sync with maint
* maint:
Diffstat (limited to 'mergetools')
0 files changed, 0 insertions, 0 deletions