Code

History

Commits on ig/vimdiffwarn to docs/technical/conflicts.md5
  1. docs/cli: update URLs to from martinvonz user to jj-vcs orgMartin von Zweigbergk committed 1 year agob836e0a
  2. bookmarks: update some leftover uses of the word "branch"Martin von Zweigbergk committed 2 years ago1aa2aec
  3. docs: update description of conflicts to be about tree-level conflictsMartin von Zweigbergk committed 3 years agoec7f9e7
  4. cleanup: consistently (?) put removed conflict terms before added onesMartin von Zweigbergk committed 3 years agod087e64
  5. docs: add technical doc about a conflict designMartin von Zweigbergk committed 4 years agob64ee14