• Show log

    Commit

  • Hash : ff8d635a
    Author : Carlos Martín Nieto
    Date : 2015-05-28T18:45:57

    Merge pull request #3139 from ethomson/diff_conflicts Include conflicts when diffing