• Show log

    Commit

  • Hash : 6891a862
    Author : Edward Thomson
    Date : 2014-01-19T18:12:22

    Load merge.conflictstyle setting from config