diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-09-17 13:53:49 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-09-17 13:53:49 -0700 |
| commit | 4dd0c4a44cf9500f3197062da1a82a83a867fb94 (patch) | |
| tree | d5d55d67667be9b7fb1c0688c12e567d60bc1219 | |
| parent | 6709a117cc59ed15e0f878bf80b9e4e2af24da3e (diff) | |
| parent | b9b07efdb2ac35684d3ee3fe98f91691d5b8642a (diff) | |
| download | git-4dd0c4a44cf9500f3197062da1a82a83a867fb94.tar.gz | |
Merge branch 'tg/conflict-marker-size'
Developer aid.
* tg/conflict-marker-size:
.gitattributes: add conflict-marker-size for relevant files
| -rw-r--r-- | .gitattributes | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index 1bdc91e282..49b3051641 100644 --- a/.gitattributes +++ b/.gitattributes @@ -9,3 +9,7 @@ /command-list.txt eol=lf /GIT-VERSION-GEN eol=lf /mergetools/* eol=lf +/Documentation/git-merge.txt conflict-marker-size=32 +/Documentation/gitk.txt conflict-marker-size=32 +/Documentation/user-manual.txt conflict-marker-size=32 +/t/t????-*.sh conflict-marker-size=32 |