• Show log

    Commit

  • Hash : f69721c3
    Author : Stefan Sperling
    Date : 2019-10-21T09:04:57

    show base commit hash and omit filenames in conflict markers