OSDN Git Service

Fix GitHub issue #154: WinMerge 3-Way Compare Bugs: Always Shows Unique Items
authorTakashi Sawanaka <sdottaka@users.sourceforge.net>
Wed, 19 Jun 2019 14:17:22 +0000 (23:17 +0900)
committerTakashi Sawanaka <sdottaka@users.sourceforge.net>
Wed, 19 Jun 2019 14:17:22 +0000 (23:17 +0900)
commit00a21d85ec5f8e81b93c438e0dcdf6fd9768c075
tree3f85ce41244959e55d7b2770bddabf9181d95500
parent77589aa0120e8748b61efa6ee35d70f2b7ea7607
Fix GitHub issue #154: WinMerge 3-Way Compare Bugs: Always Shows Unique Items
44 files changed:
Src/DiffItem.h
Src/DirActions.cpp
Src/DirActions.h
Src/DirView.cpp
Src/DirView.h
Src/Merge.rc
Src/OptionsDef.h
Src/OptionsInit.cpp
Src/resource.h
Translations/WinMerge/Basque.po
Translations/WinMerge/Brazilian.po
Translations/WinMerge/Bulgarian.po
Translations/WinMerge/Catalan.po
Translations/WinMerge/ChineseSimplified.po
Translations/WinMerge/ChineseTraditional.po
Translations/WinMerge/Croatian.po
Translations/WinMerge/Czech.po
Translations/WinMerge/Danish.po
Translations/WinMerge/Dutch.po
Translations/WinMerge/English.pot
Translations/WinMerge/Finnish.po
Translations/WinMerge/French.po
Translations/WinMerge/Galician.po
Translations/WinMerge/German.po
Translations/WinMerge/Greek.po
Translations/WinMerge/Hungarian.po
Translations/WinMerge/Italian.po
Translations/WinMerge/Japanese.po
Translations/WinMerge/Korean.po
Translations/WinMerge/Lithuanian.po
Translations/WinMerge/Norwegian.po
Translations/WinMerge/Persian.po
Translations/WinMerge/Polish.po
Translations/WinMerge/Portuguese.po
Translations/WinMerge/Romanian.po
Translations/WinMerge/Russian.po
Translations/WinMerge/Serbian.po
Translations/WinMerge/Sinhala.po
Translations/WinMerge/Slovak.po
Translations/WinMerge/Slovenian.po
Translations/WinMerge/Spanish.po
Translations/WinMerge/Swedish.po
Translations/WinMerge/Turkish.po
Translations/WinMerge/Ukrainian.po