Commit c864b4ab996159a2cb0905aafbccb3347560e4ac

Jason Haslam 2016-05-12T13:18:07

Ignore submodules when checking for merge conflicts in the workdir.