Commit 70681ff740c061e38f21abd33023d636d99621ce

Jason Haslam 2016-02-16T21:02:41

checkout: handle dirty submodules correctly Don't generate conflicts when checking out a modified submodule and the submodule is dirty or modified in the workdir.