diff options
| author | isanae <14251494+isanae@users.noreply.github.com> | 2019-05-28 10:53:55 -0400 |
|---|---|---|
| committer | isanae <14251494+isanae@users.noreply.github.com> | 2019-05-28 10:53:55 -0400 |
| commit | ee92fa9fc89ab047a63716c48e13d3d0a76af4fb (patch) | |
| tree | a51b669d08e3652b2b3a5286d10d3b73d1b4cf68 /src/nxmaccessmanager.cpp | |
| parent | d3c244c83427174f80d59d3ebbafd2c4263f9b4f (diff) | |
reverted change that showed the conflicted file first in the preview dialog
I'm not sure how I got to the conclusion that this was a better idea: preview was always an option for those files, and it has always shown the winning file, so I changed some long-standing behaviour for no reason. I reverted that change, although I'm leaving the functionality in previewFileWithAlternatives() to specify the selected origin because it works and could be useful in the future
Diffstat (limited to 'src/nxmaccessmanager.cpp')
0 files changed, 0 insertions, 0 deletions