.gitattributes · 3d57541d6d4fa094db0ceede2972d27d0a0a0246 · André Pedro / CMake · GitLab

Snippets Groups Projects

Forked from CMake / CMake

37564 commits behind the upstream repository.

8 years ago
da60adc3
Tell Git to use a distinct conflict marker size in `.rst` files · da60adc3
Brad King authored 8 years ago
```
Use a long conflict marker size that is unlikely to be in conflict
with a `=======` section header underline.
```
da60adc3

History
Tell Git to use a distinct conflict marker size in `.rst` files
Brad King authored 8 years ago
```
Use a long conflict marker size that is unlikely to be in conflict
with a `=======` section header underline.
```

.gitattributes 658 B