diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-05-18 14:40:14 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-05-18 14:40:14 -0700 |
commit | 10b6646afcf540139cdcf587071a3ae7b0efbc0a (patch) | |
tree | f6ab346607bf792a3c6f6b17c5b90cb9ead10b18 /merge-recursive.c | |
parent | Merge branch 'rn/glossary-typofix' into HEAD (diff) | |
parent | t7300: mark test with SANITY (diff) | |
download | tgif-10b6646afcf540139cdcf587071a3ae7b0efbc0a.tar.xz |
Merge branch 'sb/clean-test-fix' into HEAD
* sb/clean-test-fix:
t7300: mark test with SANITY
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions