WIP: remerge-diff: suppress conflict marker labels #1880
Annotations
5 errors and 1 warning
|
Run ci/run-build-and-tests.sh
failed: t4069.4 remerge-diff with both a resolved conflict and an unrelated change
|
|
Run ci/run-build-and-tests.sh
failed: t4069.5 pickaxe still includes additional headers for relevant changes
|
|
Run ci/run-build-and-tests.sh
failed: t4069.7 remerge-diff also works for git-diff-tree
|
|
Run ci/run-build-and-tests.sh
failed: t4069.15 remerge-diff turns off history simplification
|
|
Run ci/run-build-and-tests.sh
Process completed with exit code 1.
|
|
Run ci/install-dependencies.sh
Already linked: /usr/local/Cellar/gettext/0.23
|
Loading