Code

History

Commits on wd/combined-diff to lib/src/diff_presentation7
  1. cli: support combined diff in :git style diffYuantao Wang committed 9 months ago4f1592e
  2. lib: support combined diffYuantao Wang committed 9 months ago86ea7c4
  3. clippy: fix elidable_lifetime_names lintxtqqczze committed 9 months ago91954b0
  4. merge: include conflict labels when describing non-file conflictsScott Taylor committed 10 months ago34a1f86
  5. conflicts: propagate conflict labels down to materialization functionsScott Taylor committed 1 year ago9b9bdd0
  6. diff_util: replace `[T; 2]` with `Diff<T>`Scott Taylor committed 1 year ago6433180
  7. diff_util: move unified diff utils to `jj-lib`Ilya Grigoriev committed 1 year agoe921bfa