Fixed cosmetic relative shown by conflicter due to #378
Merge pull request #413 from jdespatis/cosmetic-relative-path-log2

Fixed cosmetic relative shown by conflicter due to #378