Code

History

Commits on Eekle-patch-1 to lib/src/diff_presentation4
  1. merge: include conflict labels when describing non-file conflictsScott Taylor committed 10 months ago34a1f86
  2. conflicts: propagate conflict labels down to materialization functionsScott Taylor committed 1 year ago9b9bdd0
  3. diff_util: replace `[T; 2]` with `Diff<T>`Scott Taylor committed 1 year ago6433180
  4. diff_util: move unified diff utils to `jj-lib`Ilya Grigoriev committed 1 year agoe921bfa