still trigger conflict resolution for existing entries when the curre…#6846

Merged

MorrisJobke merged 2 commits into

filelist-confict-path

Nov 9, 2017

Commits on Nov 7, 2017

still trigger conflict resolution for existing entries when the current entry doesn't need it
icewind1991
committed
never show '/' as path for conflicting file names
icewind1991
committed