Skip to content
GitLab
Explore
Sign in
SDK
KDiff3
Repository
kdiff3
src
MergeFileInfos.cpp
Find file
Blame
History
Permalink
make non-normal files always conflict.
· 7bbd4690
Michael Reeves
authored
Jan 21, 2019
7bbd4690