WIP: remerge-diff: suppress conflict marker labels #1880
Annotations
5 errors
|
test
failed: t4069.4 remerge-diff with both a resolved conflict and an unrelated change
|
|
test
failed: t4069.5 pickaxe still includes additional headers for relevant changes
|
|
test
failed: t4069.7 remerge-diff also works for git-diff-tree
|
|
test
failed: t4069.15 remerge-diff turns off history simplification
|
|
test
Process completed with exit code 1.
|
Loading