Code

History

Commits on git-sync to docs/conflicts.md21
  1. docs: fix some documentation errors and improvementsBjörn Kautler committed 10 months ago24905c8
  2. conflict: encode ending EOL conflicts in the materialized conflictKaiyi Li committed 10 months agobed8e07
  3. docs: use conflict labels consistently in all examplesScott Taylor committed 10 months ago273f8ad
  4. conflicts: show "noeol" state separately for each side of a diffScott Taylor committed 10 months ago2ce2a44
  5. rewrite: add conflict labels when merging commit treesScott Taylor committed 1 year ago04a9121
  6. conflicts: update conflict marker formatScott Taylor committed 11 months agoba73442
  7. docs: fix MD012 markdown lintxtqqczze committed 11 months agof357791
  8. docs: fix syntax highlighting for conflicts.mdScott Taylor committed 1 year agoa95281f
  9. docs: add language identifiers to code blocks to improve syntax highlightingVincent Ging Ho Yim committed 2 years agoebac2b8
  10. conflicts: use clearer wording for missing newline commentScott Taylor committed 1 year ago66808e5
  11. docs: explain `[noeol]` conflict marker commentScott Taylor committed 1 year ago95df920
  12. docs: explain long conflict markersScott Taylor committed 1 year ago0dbcdf7
  13. docs: rewrite conflict marker docs to include new stylesScott Taylor committed 1 year ago472fd35
  14. docs: Fix example with Git conflicts markersFedor Sheremetyev committed 2 years agoc43096b
  15. politics: delete references to PijulMartin von Zweigbergk committed 2 years ago0525dc9
  16. docs: indent conflict marker examples to not confuse toolsMartin von Zweigbergk committed 3 years ago9d040fe
  17. conflicts: change diff line marker to %%%%%%%Yuya Nishihara committed 4 years ago16f2b82
  18. docs: describe our unusual conflict marker styleMartin von Zweigbergk committed 4 years ago6e8f822
  19. docs: add technical doc about a conflict designMartin von Zweigbergk committed 4 years agob64ee14
  20. Fix a link from 423a894Matthew L Daniel committed 4 years ago88cc9ff
  21. docs: add doc about a first-class conflictsMartin von Zweigbergk committed 4 years ago71b0233