|
|
|
|
|
|
by bacon_waffle
1550 days ago
|
|
|
According to `kdiff3 --help`, there's a flag --qall "Do not solve conflicts automatically.". I've not noticed the problem you describe, so can't confirm whether it is solved by that flag - a while ago I mostly switched to Sublime Merge from kdiff3. |
|
|