Make merge return the right alignment even if it's not doing anything.

[dcpomatic.git] / .gitmodules

[submodule "test/data"]
        path = test/data
        url = ../dcpomatic-test-data.git