Make merge return the right alignment even if it's not doing anything.
[dcpomatic.git] / COPYING
2012-07-14 Carl HetheringtonMove things round a bit.