| commit | 4dd0c4a44cf9500f3197062da1a82a83a867fb94 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 17 Sep 2018 20:53:49 +0000 (17 13:53 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 17 Sep 2018 20:53:49 +0000 (17 13:53 -0700) | ||
| tree | d5d55d67667be9b7fb1c0688c12e567d60bc1219 | treesnapshot (tar.gz zip) |
| parent | 6709a117cc59ed15e0f878bf80b9e4e2af24da3e | commitdiff |
| parent | b9b07efdb2ac35684d3ee3fe98f91691d5b8642a | commitdiff |
Merge branch 'tg/conflict-marker-size'
Developer aid.
* tg/conflict-marker-size:
.gitattributes: add conflict-marker-size for relevant files
Developer aid.
* tg/conflict-marker-size:
.gitattributes: add conflict-marker-size for relevant files