2 Commits

Author	SHA1	Message	Date
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
Glen Choo	468418f1ce	cli: add interdiff command ... Add the `jj interdiff` command for comparing only the diffs of commits. Its args are identical to that of `jj diff`, minus `--revision` (because interdiff always requires two commits). Like `jj obslog -p`, Changes introduced by intervening commits are ignored by rebasing `--from` onto `--to` 's parents.	2022-09-02 02:59:37 +08:00