Code

History

Commits on CacheMyWorkingCopy to cli/tests/test_tree_level_conflicts.rs6
  1. compile integration tests as a single binaryjyn committed 2 years agod66fcf2
  2. tests: replace jj_cmd_success() involving mutation to allow stderr outputYuya Nishihara committed 3 years ago58acc1d
  3. cli: enable tree-level conflicts by defaultMartin von Zweigbergk committed 3 years ago2ccb17b
  4. revset: convert root symbol to functionYuya Nishihara committed 3 years agoe3c85d6
  5. merged_trees: consider conflict-format-change-only commits emptyMartin von Zweigbergk committed 3 years ago61501db
  6. merged_tree: add config option to write trees using new formatMartin von Zweigbergk committed 3 years ago8e47d2d