Code

History

Commits on ig/conflictsimp35+
  1. docs conflicts.md: explain conflict simplification delayIlya Grigoriev committed 1 year ago7fa8248
  2. cli config edit: Rollback to previous config when invalid TOML is savedThéo Daron committed 1 year ago3ab9e09
  3. completion: fix completion of arguments for aliases/default-command in bash and zshJonas Greitemann committed 1 year ago9289840
  4. completion tests: parameterize test case over different shellsJonas Greitemann committed 1 year agoeaaaf05
  5. templates: add self.trailers().contains_key(key)Gaëtan Lehmann committed 1 year ago2c4a032
  6. CliRunner: don't require hook functions to have static lifetimeMartin von Zweigbergk committed 1 year agob7489aa
  7. CliRunner: replace start hook by dispatch hookMartin von Zweigbergk committed 1 year ago4435fae
  8. cargo: bump the cargo-dependencies group with 3 updatesdependabot[bot] committed 1 year ago517292f
  9. github: bump the github-dependencies group with 5 updatesdependabot[bot] committed 1 year agob2636dd
  10. templater: don't attribute method table functions as pubYuya Nishihara committed 1 year ago4f3e7e9
  11. merge-tools: builtin: refactor mapping of binary filesYuya Nishihara committed 1 year ago27a35a7
  12. templates: implement `Commit.trailers()`Mateus Auler committed 1 year ago968806b
  13. merge-tools: builtin: parse conflict hunks back to merge valueYuya Nishihara committed 1 year ago6e67d79
  14. merge-tools: builtin: split apply_diff_builtin() functionYuya Nishihara committed 1 year agoacb4e27
  15. tests: do not shell out taplo to gather forgotten test filesYuya Nishihara committed 1 year ago105c892
  16. docs conflicts.md: clarify the revert example a bitIlya Grigoriev committed 1 year ago5a73518
  17. docs conflicts.md: fix confusing typoIlya Grigoriev committed 1 year ago1f14f7a
  18. local_working_copy: avoid a `block_on()` in already async functionMartin von Zweigbergk committed 1 year ago1347794
  19. merge-tools: builtin: leverage materialized_diff_stream()Yuya Nishihara committed 1 year agoa3dcd8b
  20. merge-tools: builtin: do not include unchanged entry in test diffs, sort pathsYuya Nishihara committed 1 year agobe37209
  21. merge-tools: builtin: extract wrapper functions in testsYuya Nishihara committed 1 year ago9c723a1
  22. git: tolerate unknown `git.fetch` remotes if others are availableJacob Hayes committed 1 year ago1cdd790
  23. docs: make technical conflicts doc better match our recent thinkingMartin von Zweigbergk committed 1 year ago92629de
  24. cli: put editor-*.jjdescription file in /tmp instead of .jj/repo/Martin von Zweigbergk committed 1 year ago146900a
  25. merged_tree: make `merge_trees()` asyncMartin von Zweigbergk committed 1 year agod41c83e
  26. tests: factor out utility function `is_external_tool_installed`Jonas Greitemann committed 1 year ago7bb8e17
  27. config-schema: allow "command-env"-style for editors and fix toolsJonas Greitemann committed 1 year agobf2c01e
  28. config-schema: require both "command" and "env" keys in structured tool configJonas Greitemann committed 1 year agod35dd31
  29. config-schema: deny empty arrays for command-like config optionsJonas Greitemann committed 1 year ago4a1754b
  30. config-schema: schema wrongly allowed `ui.pager.command` to be a stringJonas Greitemann committed 1 year ago5444067
  31. config-schema: fix 2 default values which weren't booleans, but stringsJonas Greitemann committed 1 year agod4024e0
  32. config-schema: add sample config files to exercise schema testsJonas Greitemann committed 1 year ago8c4586a
  33. config-schema: use datatest-stable crate to instantiate testsJonas Greitemann committed 1 year agod286b40
  34. tests: allow multiple integration tests in check for forgotton test filesJonas Greitemann committed 1 year ago8882f00
  35. config-schema: add missing default for `core.fsmonitor`Jonas Greitemann committed 1 year ago69cf7b3