OSDN Git Service

Fix issue #1326: Backup files: Misleading error message when file cannot be written
[winmerge-jp/winmerge-jp.git] / Src / Merge.cpp
2022-05-21 Takashi SawanakaFix issue #1326: Backup files: Misleading error messag...
2022-04-22 Takashi SawanakaReduce unnecessary copying
2022-03-18 germanaizekUsage std::move(), replace ' = ""; ' to '.clear()'...
2022-01-23 Takashi SawanakaClipboard Compare (#1147)
2021-12-05 Jun TajimaAdd a feature to save/restore the ”Ignore numbers”...
2021-09-28 Takashi SawanakaConflictFileParser: use namespace
2021-09-05 Jun TajimaAdd a feature to set items saved to or restored from...
2021-08-15 Takashi SawanakaAdd /EnableExitCode command line switch
2021-08-14 Takashi SawanakaSet the comparison options read from the project file...
2021-08-14 Takashi SawanakaSet the exit status of the process to 0 if the comparis...
2021-08-14 Jun TajimaAdd a feature to save/restore compare options to/from...
2021-08-13 Takashi SawanakaDon't load file filters until they are used (2)
2021-08-12 Takashi SawanakaDon't load file filters until they are used
2021-08-09 Takashi SawanakaAdd /c command line option
2021-08-01 Takashi SawanakaMake CreateOptionsManager() function static function
2021-07-31 Takashi Sawanaka- Move some CMergeEditVew::On* functions to CMergeDoc...
2021-07-25 Takashi SawanakaAdd CMergeApp::GetLangName() function
2021-07-22 Takashi SawanakaAdd /fileext command line option
2021-07-22 Takashi SawanakaAdd /new command line option
2021-07-18 Takashi SawanakaAdd /table-delimiter, /table-quote and /table-allownewl...
2021-07-17 Takashi SawanakaAdd /t command line option to specify the type of windo...
2021-07-17 Takashi SawanakaImplement osdn.net #41528: command line option that...
2021-07-15 Takashi SawanakaFix issue #876' Registry key with "Executable" and...
2021-07-12 Takashi SawanakaAdd /inifile command line option (2) related to https...
2021-07-11 Takashi SawanakaAdd /inifile command line option
2021-07-06 Takashi SawanakaImplement issue #772: Add preference option to clear...
2021-07-03 Takashi SawanakaThere is a problem that OleUninitialize() in mfc/oleini...
2021-06-20 Takashi SawanakaImprove plugin system (#797)
2021-05-21 Takashi Sawanaka- Allow environment variables to be included in the...
2021-05-16 Takashi SawanakaMake Unpacker plugins available for image compare and...
2021-05-15 Takashi SawanakatheApp is unnecessary because these methods are a stati...
2021-05-09 Takashi Sawanaka- C(Reg|Ini)OptionsMgr::SplitName() -> COptionsMgr...
2021-04-30 Takashi SawanakaLeave the class name as CIniOptionsMgr, but rename...
2021-04-29 grzesiePossibility to store settings in INI file (#248) (...
2021-04-21 Takashi Sawanakarefactor
2021-04-20 Takashi Sawanakarefactor
2021-04-20 Takashi SawanakaAdd "Open Parent Folder" menu item to the file compare...
2021-04-10 Takashi SawanakaFix compilation warnings
2021-03-14 Takashi SawanakaMake it possible to specify the file type in the "Selec...
2021-02-28 Takashi SawanakaAdd /self-compare command line option
2021-02-12 Takashi SawanakaFix GitHub issue #622: Single instance mode does not...
2021-01-27 Takashi SawanakaRename "Ignored Substitutions" to "Substitution Filters"
2021-01-26 Takashi SawanakaA new feature "Ignored Substitutions" (2) (#560)
2021-01-10 Takashi SawanakaMerge remote-tracking branch 'origin/stable'
2021-01-10 Takashi SawanakaMerge remote-tracking branch 'origin/stable'
2021-01-10 Takashi SawanakaMerge branch 'stable' of c:\dev\winmerge-stable
2021-01-08 Takashi SawanakaMerge pull request #545 from GreyMerlin/master
2021-01-08 EugeneLaptevAdded a new feature "Ignored Substitutions", which...
2021-01-08 EugeneSumoAdded a new feature "Ignored Substitutions", which...
2021-01-05 Takashi SawanakaMerge pull request #539 from GreyMerlin/master
2021-01-04 GreyMerlinFix "LNT1000: A sub-expression may overflow before...
2021-01-02 Takashi SawanakaGitHub issue #530: [feature request] Add options to...
2020-12-12 Takashi SawanakaAdd the command line option "/s-" to ensure that anothe...
2020-11-01 Takashi SawanakaSyntax-highlighter-based comment filter (Fix osdn.net...
2020-10-26 Takashi SawanakaUpdate English.pot (2)
2020-10-17 LMSMerge pull request #8 from WinMerge/master
2020-10-10 Takashi SawanakaMerge.cpp: Avoid unnecessary drawing at startup
2020-09-16 Takashi SawanakaMake the toolbar icon DPI-aware. fixes #370, fixes...
2020-08-05 LMSMerge pull request #6 from WinMerge/master
2020-07-28 Takashi SawanakaMerge branch 'master' into master
2020-05-26 Takashi SawanakaFix a problem where tests in the "Test" configuration...
2020-05-20 LMSMerge pull request #5 from WinMerge/master
2020-05-20 Takashi SawanakaAllow a unpacker plugin to be specified with command...
2020-05-16 Takashi SawanakaUse SPDX license identifier
2020-03-29 Takashi Sawanaka- Add Solarized Dark/Light color scheme
2020-03-21 Takashi SawanakaMerge remote-tracking branch 'origin/master'
2020-03-21 Takashi SawanakaAttempt to speed up
2020-03-14 Takashi SawanakaRegOptionsMgr.*: Make writing to the registry asynchronous
2020-01-05 Takashi SawanakaMerge.cpp: Allow path starting '\' without drive name...
2019-12-14 Takashi SawanakaMerge.cpp: CMergeApp::GetProfile*():
2019-11-24 Takashi SawanakaAdd support for Color Emoji (WIP)
2019-07-04 Takashi SawanakaReduce the size of the executable file (3)
2019-06-30 Takashi SawanakaCppcheck: The scope of the variable '...' can be reduced
2019-06-29 datadiodeFavor PathContext::GetSize() over PathContext::size()
2019-06-25 Takashi SawanakaMerged in gerundt/winmerge/OwnDirColors (pull request...
2019-06-20 Takashi SawanakaReduce compilation warnings
2019-06-16 Takashi SawanakaAllow multiple <paths> in project file
2019-06-02 gandfMerge pull request #2 from WinMerge/master
2019-05-26 Takashi SawanakaFix bitbucket issue #158: Supporting relative path...
2019-04-14 Takashi SawanakaMerged in gerundt/winmerge (pull request #37)
2019-04-11 Takashi SawanakaFix GitHub issue #138: Location and Diff pane visibilit...
2019-04-06 Takashi SawanakaRename CChlidFrame class to CMergeEditFrame class
2019-03-02 Takashi SawanakaMerge.cpp: Use ATTACH_PARENT_PROCESS instead of -1
2019-03-02 Takashi SawanakaMerge.cpp: Output the message of message box to parent...
2019-02-24 Takashi SawanakaUse COptionsMgr instead of GetProfile*() and WriteProfi...
2019-02-01 Takashi SawanakaRemove WMPROFILE
2019-02-01 Takashi SawanakaReduce application startup time by reducing the number...
2018-12-23 Takashi SawanakaMerge
2018-12-23 Takashi SawanakaMerge.cpp: Show translated HTML help if exists
2018-10-28 Takashi SawanakaMerge pull request #101 from GreyMerlin/master
2018-10-28 GreyMerlinVarious refactorings involving NULL, ASSERT, TRUE and...
2018-10-28 GreyMerlinVarious refactorings involving NULL, ASSERT, TRUE and...
2018-10-28 GreyMerlinVarious refactorings involving NULL, ASSERT, TRUE and...
2018-10-28 GreyMerlinCleanup PLUGIN_MODE usage
2018-10-28 GreyMerlinVarious refactorings involving NULL, ASSERT, TRUE and...
2018-10-22 Takashi SawanakaMerge pull request #99 from GreyMerlin/master
2018-10-22 Takashi SawanakaWrite an error message to the console when unknown...
2018-10-12 Takashi SawanakaMerge pull request #97 from GreyMerlin/master
2018-10-11 GreyMerlin`BOOL` becomes `bool` and related (2)
2018-10-11 GreyMerlin`BOOL` becomes `bool` and related (1)
next