Code

History

Commits on CacheMyWorkingCopy to docs/technical/conflicts.md3
  1. docs: update description of conflicts to be about tree-level conflictsMartin von Zweigbergk committed 3 years agoec7f9e7
  2. cleanup: consistently (?) put removed conflict terms before added onesMartin von Zweigbergk committed 3 years agod087e64
  3. docs: add technical doc about a conflict designMartin von Zweigbergk committed 4 years agob64ee14