Commit 85ef6ec5f02b15163b10ad9153516d7fb3e42990

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

Ignore submodules when checking for merge conflicts in the workdir.