Martin von Zweigbergk 9d040fef78 docs: indent conflict marker examples to not confuse tools ... When importing `conflicts.md` into the Google repo, our internal tools complained that it contained conflict markers. Similarly, if you ever get an actual merge conflict in the file, the working-copy snapshotting would parse our sample conflict markers here, forcing you to work around it. Let's avoid that by indenting the conflict markers. Hopefully readers will understand that the leading space is not part of the markers.		2022-12-12 16:20:40 -08:00
..
technical	docs: mention that the "view" object knows about all workspaces	2022-12-08 17:30:29 -08:00
branches.md	templater: indicate if branch needs to be pushed to a remote	2022-11-09 22:44:55 -08:00
code-of-conduct.md	Boilerplate for new Google open source project	2020-12-11 23:37:59 -08:00
config.md	pager: default to less -FRX	2022-12-04 00:00:31 -08:00
config.toml	Documentation for jj resolve and merge tool config	2022-12-03 15:12:40 -08:00
conflicts.md	docs: indent conflict marker examples to not confuse tools	2022-12-12 16:20:40 -08:00
contributing.md	docs: describe how we do code reviews	2022-12-02 13:05:32 -08:00
git-comparison.md	docs: describe git commit --fixup equivalent	2022-11-19 14:22:34 -08:00
git-compatibility.md	feature: support git credential helpers	2022-11-19 22:06:27 -08:00
operation-log.md	docs: mention that the "view" object knows about all workspaces	2022-12-08 17:30:29 -08:00
related-work.md	docs: hyphenate "working-copy" when used as a compound modifier	2022-08-25 18:08:36 -07:00
revsets.md	revset: add unary negate (or set complement) operator '~y'	2022-11-29 15:46:15 +09:00
tutorial.md	tutorial: mention jj edit and when it's useful	2022-12-09 22:28:33 -08:00
working-copy.md	cli: add a command for updating a stale working copy	2022-12-05 08:50:52 -08:00