diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-06-26 14:09:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-26 14:09:32 -0700 |
| commit | 6968ca9b255d1ee327c36bdd79418aa8d8b2c38f (patch) | |
| tree | 9ab6f75ecb3840b3739e735ef342e52fbd2b93b7 /merge-recursive.c | |
| parent | Merge branch 'jk/add-p-commentchar-fix' (diff) | |
| parent | t7508: fix a broken indentation (diff) | |
| download | tgif-6968ca9b255d1ee327c36bdd79418aa8d8b2c38f.tar.xz | |
Merge branch 'ks/t7508-indent-fix'
Cosmetic update to a test.
* ks/t7508-indent-fix:
t7508: fix a broken indentation
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions