diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-11-21 22:57:53 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-21 22:57:53 +0900 |
| commit | 04d70dd64837a088f1e95286e328801085631e82 (patch) | |
| tree | 53eae279181c6d9cce28e2f2b40d51311718a20c /t/t4013/diff.diff_initial..side | |
| parent | Merge branch 'ts/doc-build-manpage-xsl-quietly' into maint (diff) | |
| parent | .gitattributes: add conflict-marker-size for relevant files (diff) | |
| download | git-04d70dd64837a088f1e95286e328801085631e82.tar.gz git-04d70dd64837a088f1e95286e328801085631e82.zip | |
Merge branch 'tg/conflict-marker-size' into maint
Developer aid.
* tg/conflict-marker-size:
.gitattributes: add conflict-marker-size for relevant files
Diffstat (limited to 't/t4013/diff.diff_initial..side')
0 files changed, 0 insertions, 0 deletions