mirror of
https://github.com/martinvonz/jj.git
synced 2025-01-29 23:57:51 +00:00
0b9d23c3ad
This is basic implementation. There's no config knob to enable the external diff command by default. It reuses the merge-tools table because that's how external diff/merge commands are currently configured. We might want to reorganize them in #1285. If you run "jj diff --tool meld", GUI diff will open and jj will wait for meld to quit. This also applies to "jj log -p". The "diff --tool gui" behavior is somewhat useful, but "log -p --tool gui" wouldn't. We might want some flag to mark the tool output can't be streamed. Another thing to consider is tools that can't generate directory diffs. Git executes ext-diff tool per file, but we don't. Difftastic can compare directories, and doing that should be more efficient since diffs can be computed in parallel (at the expense of unsorted output.) Closes #1886 |
||
|---|---|---|
| .. | ||
| design | ||
| technical | ||
| branches.md | ||
| code-of-conduct.md | ||
| config.md | ||
| config.toml | ||
| conflicts.md | ||
| contributing.md | ||
| git-comparison.md | ||
| git-compatibility.md | ||
| github.md | ||
| glossary.md | ||
| operation-log.md | ||
| related-work.md | ||
| revsets.md | ||
| sapling-comparison.md | ||
| templates.md | ||
| tutorial.md | ||
| working-copy.md | ||