Skip to content
GitLab
  • Menu
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • K KWSys
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 0
    • Issues 0
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 0
    • Merge requests 0
  • Deployments
    • Deployments
    • Releases
  • Packages & Registries
    • Packages & Registries
    • Container Registry
  • Monitor
    • Monitor
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • Repository
  • Wiki
    • Wiki
  • Activity
  • Graph
  • Create a new issue
  • Commits
  • Issue Boards
Collapse sidebar
  • Mathieu Westphal
  • KWSys
  • Repository
Switch branch/tag
  • kwsys
  • .gitattributes
Find file BlameHistoryPermalink
  • Brad King's avatar
    Tell Git to use a distinct conflict marker size in `.rst` files · 5f206c3a
    Brad King authored Dec 13, 2016
    Use a long conflict marker size that is unlikely to be in conflict
    with a `=======` section header underline.
    5f206c3a