mirror of
https://github.com/martinvonz/jj.git
synced 2025-01-20 03:20:08 +00:00
4ecf75efc1
I don't think recommending KDIff3 for diff editing is good advice in most cases (as opposed to merge conflict resolution, for which KDiff3 is very good). OTOH, trying Meld for diff editing is a good idea for many people. Historically, this part of the docs uses KDiff3 because it was written when `meld` was the default and `:builtin` did not exist. |
||
---|---|---|
.. | ||
design | ||
governance | ||
technical | ||
bookmarks.md | ||
cli-reference.md | ||
code-of-conduct.md | ||
community_tools.md | ||
config.md | ||
config.toml | ||
conflicts.md | ||
contributing.md | ||
design_doc_blueprint.md | ||
design_docs.md | ||
FAQ.md | ||
filesets.md | ||
git-comparison.md | ||
git-compatibility.md | ||
github.md | ||
glossary.md | ||
index.md | ||
install-and-setup.md | ||
operation-log.md | ||
related-work.md | ||
revsets.md | ||
roadmap.md | ||
sapling-comparison.md | ||
templates.md | ||
testimonials.md | ||
tutorial.md | ||
windows.md | ||
working-copy.md |