History

Commits on ig/diffline to cli/tests/test_diffedit_command.rs54

tests: avoid deprecated `jj init --git/--git-repo`Martin von Zweigbergk committed 2 years agofe9daac
merge_tools: leverage Display for printing exit statusYuya Nishihara committed 2 years agob0d17ac
conflicts.rs: label conflict number and sides next to conflict markersIlya Grigoriev committed 2 years ago70b517c
git_backend: add a README to conflicted commitsMartin von Zweigbergk committed 2 years ago9d7ed54
cli: print conflicted paths whenever the working copy is changedBenjamin Tan committed 2 years ago7e46cc1
git_backend: write trees involved in conflict in git commit headerMartin von Zweigbergk committed 2 years ago4d42604
tests: avoid deprecated `jj co`Martin von Zweigbergk committed 2 years ago4d5d5c4
cli: add --tool=<name> option to diff/merge editing commandsYuya Nishihara committed 2 years ago7ce25f8
merge_tools: process "ui.diff-instructions" option by callerYuya Nishihara committed 2 years ago529acb3
cli: rename --verbose to --debug to better fit what it doesAlexis (Poliorcetics) Bourget committed 2 years ago0fc5005
compile integration tests as a single binaryjyn committed 2 years agod66fcf2
cli: preserve source of user error, print source chain one by oneYuya Nishihara committed 2 years ago30666df
cli: change `R` to `D` for "deleted" in diff summaryIlya Grigoriev committed 2 years agobef2eca
cli: send status messages to stderr, specify stdout/stderr explicitlyYuya Nishihara committed 3 years ago7a3e724
tests: replace jj_cmd_success() involving mutation to allow stderr outputYuya Nishihara committed 3 years ago58acc1d
cli: enable tree-level conflicts by defaultMartin von Zweigbergk committed 3 years ago2ccb17b
merge_tools: Allow 3-pane diff editingIlya Grigoriev committed 3 years ago038867f
test_diffedit_command: Show that diffedit ignores unknown filesIlya Grigoriev committed 3 years agofdf1a56
tests: move `tests/` under `cli/` so they're run againMartin von Zweigbergk committed 3 years ago0075174