Code

History

Commits on ig/docs-commitid to docs/conflicts.md14
  1. docs: fix syntax highlighting for conflicts.mdScott Taylor committed 1 year agoa95281f
  2. docs: add language identifiers to code blocks to improve syntax highlightingVincent Ging Ho Yim committed 2 years agoebac2b8
  3. conflicts: use clearer wording for missing newline commentScott Taylor committed 1 year ago66808e5
  4. docs: explain `[noeol]` conflict marker commentScott Taylor committed 1 year ago95df920
  5. docs: explain long conflict markersScott Taylor committed 1 year ago0dbcdf7
  6. docs: rewrite conflict marker docs to include new stylesScott Taylor committed 1 year ago472fd35
  7. docs: Fix example with Git conflicts markersFedor Sheremetyev committed 2 years agoc43096b
  8. politics: delete references to PijulMartin von Zweigbergk committed 2 years ago0525dc9
  9. docs: indent conflict marker examples to not confuse toolsMartin von Zweigbergk committed 3 years ago9d040fe
  10. conflicts: change diff line marker to %%%%%%%Yuya Nishihara committed 4 years ago16f2b82
  11. docs: describe our unusual conflict marker styleMartin von Zweigbergk committed 4 years ago6e8f822
  12. docs: add technical doc about a conflict designMartin von Zweigbergk committed 4 years agob64ee14
  13. Fix a link from 423a894Matthew L Daniel committed 4 years ago88cc9ff
  14. docs: add doc about a first-class conflictsMartin von Zweigbergk committed 4 years ago71b0233