Diffusion KDiff3 7bbd469016c7

make non-normal files always conflict.
7bbd469016c7
Actions

Authored by mreeves on Jan 21 2019, 8:03 PM.

Description

make non-normal files always conflict.

Details

Committed
mreevesJan 24 2019, 4:05 AM
Parents
R983:9492ebb5cc3f: rename MergeFileInfos::dirA, MergeFileInfos::dirB, MergeFileInfos::dirC
Branches
Unknown
Tags
Unknown

Changes (1)

PathPackages
Msrc/MergeFileInfos.cpp

R983:7bbd469016c7

View Options

src/MergeFileInfos.cpp

Loading...