Martin von Zweigbergk 7b09a232bc docs: update doc about working copy now that conflicts are preserved ...

Conflicts are preserved in the working copy since ea823406541e, I just
forgot to update the documentation.

2021-12-17 16:29:20 -08:00

..

branches.md

docs: replace jj concepts by markdown docs

2021-12-17 15:18:41 -08:00

code-of-conduct.md

Boilerplate for new Google open source project

2020-12-11 23:37:59 -08:00

contributing.md

Boilerplate for new Google open source project

2020-12-11 23:37:59 -08:00

git-comparison.md

cli: add jj show command for showing commit description and diff

2021-12-17 13:28:09 -08:00

operation_log.md

docs: replace jj concepts by markdown docs

2021-12-17 15:18:41 -08:00

related_work.md

docs: mention Breezy as a similar tool

2021-11-04 08:32:42 -07:00

revsets.md

revsets: add author() and committer() functions (#46)

2021-12-15 22:50:29 -08:00

tutorial.md

docs: add pointer to new revset doc in tutorial (#46)

2021-12-15 21:41:11 -08:00

working_copy.md

docs: update doc about working copy now that conflicts are preserved

2021-12-17 16:29:20 -08:00