Yuya Nishihara 16f2b82feb conflicts: change diff line marker to %%%%%%% ... I feel the original -------/+++++++ pair is slightly confusing because each half can be a separator by itself. I don't know what character other than '-'/'+' is preferred, but let's pick '%' (for "mod") per @martinvonz suggestion.		2022-09-20 15:26:29 +09:00
..
technical	docs: change "current checkout" to "working-copy commit"	2022-09-18 16:19:58 -07:00
branches.md	docs: update to use new jj branch syntax	2022-06-09 22:24:46 -07:00
code-of-conduct.md	Boilerplate for new Google open source project	2020-12-11 23:37:59 -08:00
config.md	Documented available config settings.	2022-07-16 21:28:40 -07:00
config.toml	Added barebones config template with the odd alternative commented out.	2022-07-16 21:28:40 -07:00
conflicts.md	conflicts: change diff line marker to %%%%%%%	2022-09-20 15:26:29 +09:00
contributing.md	Boilerplate for new Google open source project	2020-12-11 23:37:59 -08:00
git-comparison.md	cli: disable open commits by default	2022-08-26 23:34:52 -07:00
git-compatibility.md	docs: change "current checkout" to "working-copy commit"	2022-09-18 16:19:58 -07:00
operation-log.md	docs: change "current checkout" to "working-copy commit"	2022-09-18 16:19:58 -07:00
related-work.md	docs: hyphenate "working-copy" when used as a compound modifier	2022-08-25 18:08:36 -07:00
revsets.md	docs: hyphenate "working-copy" when used as a compound modifier	2022-08-25 18:08:36 -07:00
tutorial.md	conflicts: change diff line marker to %%%%%%%	2022-09-20 15:26:29 +09:00
working-copy.md	docs: change "current checkout" to "working-copy commit"	2022-09-18 16:19:58 -07:00