Code

History

Commits on CacheMyWorkingCopy to docs/conflicts.md6
  1. docs: indent conflict marker examples to not confuse toolsMartin von Zweigbergk committed 3 years ago9d040fe
  2. conflicts: change diff line marker to %%%%%%%Yuya Nishihara committed 4 years ago16f2b82
  3. docs: describe our unusual conflict marker styleMartin von Zweigbergk committed 4 years ago6e8f822
  4. docs: add technical doc about a conflict designMartin von Zweigbergk committed 4 years agob64ee14
  5. Fix a link from 423a894Matthew L Daniel committed 4 years ago88cc9ff
  6. docs: add doc about a first-class conflictsMartin von Zweigbergk committed 4 years ago71b0233