• Show log

    Commit

  • Hash : 493c340c
    Author : Jacques Germishuys
    Date : 2014-09-12T21:59:09

    Added test case to illustrate bogus conflicts detected if no files were merged, and untracked files exist in the workdir.