Make merge return the right alignment even if it's not doing anything.
[dcpomatic.git] / graphics / me.jpg
graphics/me.jpg Reading blob failed.