Jesse Duffield fa2e7ae1e7 show only merge conflict files when there are merge conflicts

2022-01-26 20:28:32 +11:00

..

expected

show only merge conflict files when there are merge conflicts

2022-01-26 20:28:32 +11:00

recording.json

show only merge conflict files when there are merge conflicts

2022-01-26 20:28:32 +11:00

setup.sh

add another bisect integration test

2022-01-26 16:52:20 +11:00

test.json

more tests for branches

2021-04-06 19:34:32 +10:00