• Show log

    Commit

  • Hash : 85ef6ec5
    Author : Jason Haslam
    Date : 2016-05-12T13:18:07

    Ignore submodules when checking for merge conflicts in the workdir.