Error with kdiff3:"Opening of these files filed: - parent 1 "
Created originally on Bitbucket by Maxcimkj93 (Mekh Maksim)
At the time of the conflict merge opens window kdiff3 (what is correct) and i see window with message: "Opening of these files filed: - parent 1 ". How resolve problem? I use winows 10.