Code

History

Commits on colocated-workspaces to lib/src/diff_presentation/unified.rs6
  1. lib: make a few more functions asyncAustin Seipp committed 8 months ago5ae2acc
  2. clippy: fix elidable_lifetime_names lintxtqqczze committed 9 months ago91954b0
  3. merge: include conflict labels when describing non-file conflictsScott Taylor committed 10 months ago34a1f86
  4. conflicts: propagate conflict labels down to materialization functionsScott Taylor committed 1 year ago9b9bdd0
  5. diff_util: replace `[T; 2]` with `Diff<T>`Scott Taylor committed 1 year ago6433180
  6. diff_util: move unified diff utils to `jj-lib`Ilya Grigoriev committed 1 year agoe921bfa