Skip to content

[12] still trigger conflict resolution for existing entries when the curre…#6847

Merged
MorrisJobke merged 2 commits into
stable12from
filelist-confict-path-12
Nov 9, 2017
Merged

[12] still trigger conflict resolution for existing entries when the curre…#6847
MorrisJobke merged 2 commits into
stable12from
filelist-confict-path-12

never show '/' as path for conflicting file names

fe6b4d4
Select commit
Loading
Failed to load commit list.

Workflow runs completed with no jobs