OSDN Git Service

(root) / winmerge-jp / winmerge-jp.git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
Fix failed test
[winmerge-jp/winmerge-jp.git] / Src / MergeDoc.h
2021-03-14 Takashi SawanakaMake it possible to specify the file type in the "Selec... blob | commitdiff
2021-02-21 elsonweiAdd "Copy Selected Line(s) to/from Left/Right" feature... blob | commitdiff | diff to current
2021-01-27 Takashi SawanakaRename "Ignored Substitutions" to "Substitution Filters" blob | commitdiff | diff to current
2021-01-10 Takashi SawanakaMerge remote-tracking branch 'origin/stable' blob | commitdiff | diff to current
2021-01-10 Takashi SawanakaMerge remote-tracking branch 'origin/stable' blob | commitdiff | diff to current
2021-01-10 Takashi SawanakaMerge branch 'stable' of c:\dev\winmerge-stable blob | commitdiff | diff to current
2021-01-08 Takashi SawanakaMerge pull request #545 from GreyMerlin/master blob | commitdiff | diff to current
2021-01-08 EugeneLaptevAdded a new feature "Ignored Substitutions", which... blob | commitdiff | diff to current
2021-01-08 EugeneSumoAdded a new feature "Ignored Substitutions", which... blob | commitdiff | diff to current
2021-01-01 ranjwarriorSwap Panes functionality for 3 way compares (https... blob | commitdiff | diff to current
2021-01-01 Takashi SawanakaFix Warning C26812: Prefer 'enum class' over 'enum... blob | commitdiff | diff to current
2020-12-31 Takashi SawanakaAdd View->Diff Context->Invert menu item blob | commitdiff | diff to current
2020-09-08 Takashi SawanakaMerge branch 'master' into master blob | commitdiff | diff to current
2020-08-27 LMSMerge pull request #7 from WinMerge/master blob | commitdiff | diff to current
2020-08-09 Takashi Sawanaka- Fix the problem that pressing the F4 key did not... blob | commitdiff | diff to current
2020-08-05 LMSMerge pull request #6 from WinMerge/master blob | commitdiff | diff to current
2020-07-28 Takashi SawanakaMerge branch 'master' into master blob | commitdiff | diff to current
2020-07-26 Takashi SawanakaMerge pull request #384 from silid/master blob | commitdiff | diff to current
2020-07-26 Takashi SawanakaMade it possible to display the contents of CSV and... blob | commitdiff | diff to current
2020-06-10 Takashi SawanakaFix an issue where the cursor would move to the beginni... blob | commitdiff | diff to current
2020-05-20 LMSMerge pull request #5 from WinMerge/master blob | commitdiff | diff to current
2020-05-16 Takashi SawanakaUse SPDX license identifier blob | commitdiff | diff to current
2019-12-22 Takashi SawanakaWarning C26495 Variable '...' is uninitialized. Always... blob | commitdiff | diff to current
2019-12-01 Takashi SawanakaFix issue #229: Program is crashed! blob | commitdiff | diff to current
2019-10-24 Стоян ДимитровMerge remote-tracking branch 'upstream/master' blob | commitdiff | diff to current
2019-10-15 TichijMerge branch 'master' of https://github.com/WinMerge... blob | commitdiff | diff to current
2019-10-01 Takashi SawanakaFix GitHub issue #191: "Recompare as" menu option doesn... blob | commitdiff | diff to current
2019-10-01 Takashi SawanakaMerge branch 'master' of https://github.com/winmerge... blob | commitdiff | diff to current
2019-10-01 Takashi SawanakaFix GitHub issue #191: "Recompare as" menu option doesn... blob | commitdiff | diff to current
2019-07-04 Takashi SawanakaReduce the size of the executable file (3) blob | commitdiff | diff to current
2019-06-30 Takashi SawanakaCppcheck: The function '...' overrides a function in... blob | commitdiff | diff to current
2019-04-07 Takashi SawanakaRemove unneeded #include blob | commitdiff | diff to current
2019-04-06 Takashi SawanakaRename CChlidFrame class to CMergeEditFrame class blob | commitdiff | diff to current
2019-04-06 Takashi SawanakaWord-level merging did not work correctly if the number... blob | commitdiff | diff to current
2019-03-31 Takashi SawanakaMerge blob | commitdiff | diff to current
2019-03-31 Takashi SawanakaChange std::vector<T> output argument to return value blob | commitdiff | diff to current
2019-02-17 Takashi Sawanaka'Automatically scroll to first difference' option did... blob | commitdiff | diff to current
2019-02-01 Takashi SawanakaMerge ... Timon34/russianpo-edited-online-with-bitbucke... blob | commitdiff | diff to current
2019-01-20 Takashi SawanakaDelay calling InitialUpdateFrame() to reduce unnecessar... blob | commitdiff | diff to current
2019-01-01 Takashi SawanakaAdd support for merging word level diffs in selection. blob | commitdiff | diff to current
2018-12-02 Takashi SawanakaAdd File/Recompare As/Image menu item blob | commitdiff | diff to current
2018-09-20 sdottaka@users.sou... Merge blob | commitdiff | diff to current
2018-09-09 Takashi SawanakaDelete OnUpdate*() which does not matter if deleted blob | commitdiff | diff to current
2018-08-04 Takashi SawanakaMerge blob | commitdiff | diff to current
2018-07-30 Takashi SawanakaMerge pull request #92 from GreyMerlin/master blob | commitdiff | diff to current
2018-07-26 GreyMerlinReduce Level 4 Build Warnings (2) blob | commitdiff | diff to current
2018-06-09 Takashi SawanakaAdd Window/Split menu item blob | commitdiff | diff to current
2018-05-06 Takashi SawanakaMerge blob | commitdiff | diff to current
2018-05-06 Takashi SawanakaMergeDoc.*: Add ForEachView() and Remove GetActiveMerge... blob | commitdiff | diff to current
2018-04-22 Takashi SawanakaMergeDoc.*: Mark ignored lines by Prediffer plugin... blob | commitdiff | diff to current
2017-10-06 Takashi SawanakaMerge pull request #42 from GreyMerlin/master blob | commitdiff | diff to current
2017-10-04 GreyMerlinCleanup: Remove useless AFX_INSERT_LOCATION blob | commitdiff | diff to current
2017-06-28 Takashi SawanakaAdd GetDescription() function blob | commitdiff | diff to current
2017-01-09 Takashi SawanakaMerge blob | commitdiff | diff to current
2017-01-09 Takashi SawanakaEnabled to move to the next/previous file with the... blob | commitdiff | diff to current
2016-11-19 Takashi SawanakaMerge blob | commitdiff | diff to current
2016-09-04 Takashi SawanakaMake merge editor window D&Dable blob | commitdiff | diff to current
2016-05-28 Takashi SawanakaRemove CMergeApp::m_strDescription used as a global... blob | commitdiff | diff to current
2016-05-22 Takashi SawanakaChange the IMergeDoc::GenerateReport() function interface blob | commitdiff | diff to current
2016-04-24 Takashi Sawanakawhen removing lines that have synchronization points, blob | commitdiff | diff to current
2016-02-14 Takashi SawanakaMove a part of CMainFrame::OnToolsGeneratePatch() to... blob | commitdiff | diff to current
2015-05-03 sdottakaMerge with stable blob | commitdiff | diff to current
2015-05-03 sdottakaRemove unused codes blob | commitdiff | diff to current
2015-02-28 sdottakaMerge with stable blob | commitdiff | diff to current
2015-02-27 sdottakaFix memory leak 2.14.0+-jp-74 blob | commitdiff | diff to current
2015-02-20 sdottakaMerge with stable blob | commitdiff | diff to current
2015-02-18 sdottaka- Replace include guards with #pragma once like winmerg... blob | commitdiff | diff to current
2015-02-08 sdottakaMergeDoc.h: Remove unused function declaration blob | commitdiff | diff to current
2015-02-08 sdottakaMergeDoc.h: Remove unused function declaration blob | commitdiff | diff to current
2014-11-29 sdottakaMerge with stable blob | commitdiff | diff to current
2014-11-28 sdottakaUse std::unique_ptr/shared_ptr instead of boost::scoped... blob | commitdiff | diff to current
2014-11-11 sdottakaMerge with stable blob | commitdiff | diff to current
2014-10-02 sdottakaMerge with stable blob | commitdiff | diff to current
2014-10-02 sdottakaConstify some methods blob | commitdiff | diff to current
2014-10-02 sdottakaMerge with stable blob | commitdiff | diff to current
2014-09-22 sdottakaMove Merge Mode code in (MergeDoc.*, MergeEditView... blob | commitdiff | diff to current
2014-07-29 sdottakaMerge with stable blob | commitdiff | diff to current
2014-07-13 sdottakaAdd "Recompare As/XML" and "Recompare As/Binary" menu... blob | commitdiff | diff to current
2014-01-25 sdottakaMerge with stable blob | commitdiff | diff to current
2014-01-23 sdottaka3way-diff: Don't highlight the word diff in right pane... blob | commitdiff | diff to current
2014-01-20 sdottakaMerge with stable blob | commitdiff | diff to current
2014-01-19 sdottakaAdd Shift+F4 shortcut key for selecting previous word... blob | commitdiff | diff to current
2014-01-18 sdottakaMerge with stable blob | commitdiff | diff to current
2014-01-18 sdottaka* Use standard order of header files blob | commitdiff | diff to current
2014-01-12 sdottakaMerge with stable blob | commitdiff | diff to current
2014-01-12 sdottakaAdd "Next Conflict", "Previous Conflict" and "Auto... blob | commitdiff | diff to current
2013-12-22 sdottakaMerge with stable blob | commitdiff | diff to current
2013-12-22 sdottaka* Show the name of the applied plugin in the status bar blob | commitdiff | diff to current
2013-11-18 sdottakaMerge with stable blob | commitdiff | diff to current
2013-11-17 sdottakaRemove unused function CMergeDoc::ReloadDoc() blob | commitdiff | diff to current
2013-10-20 sdottakaMerge with stable blob | commitdiff | diff to current
2014-11-05 sdottaka* Remove MergeDoc.h and HexMergeDoc.h dependency from... blob | commitdiff | diff to current
2013-10-20 sdottakaAdd synchronization points UI like meld(meldmerge.org) blob | commitdiff | diff to current
2013-05-04 sdottakaAvoid using 'delete' operator blob | commitdiff | diff to current
2013-02-18 sdottakaCompare words per line if diff block lines > 20 (for... 2.14.0+-jp-2 blob | commitdiff | diff to current
2012-11-04 sdottaka- Remove MFC dependency blob | commitdiff | diff to current
2012-09-08 sdottakaChange EncodingError dialog to EncodingError dialog bar blob | commitdiff | diff to current
2012-02-12 sdottakaAdd Include File Compare Report check box in DirCmpRepo... blob | commitdiff | diff to current
2011-12-17 sdottakaReplace BOOL with bool blob | commitdiff | diff to current
2011-08-07 sdottakalearning about boost::scoped_* ... blob | commitdiff | diff to current
next
About OSDN
Find Software
Develop Software
Help