Jesse Duffield eb056576cf fix integration test

2022-03-17 19:13:40 +11:00

..

config

show only merge conflict files when there are merge conflicts

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

expected

fix integration test

2022-03-17 19:13:40 +11:00

recording.json

fix integration test

2022-03-17 19:13:40 +11:00

setup.sh

show only merge conflict files when there are merge conflicts

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

test.json

fix integration test

2022-03-17 19:13:40 +11:00