OSDN Git Service
(root)
/
winmerge-jp
/
winmerge-jp.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Shell Extension for Windows 11 or later (5)
[winmerge-jp/winmerge-jp.git]
/
Src
/
MergeEditView.cpp
2021-09-15
Takashi Sawanaka
Fix issue #970: When moving in the scroll pane, the...
blob
|
commitdiff
2021-08-28
Takashi Sawanaka
Fix issue #940: Replace slow (4)
blob
|
commitdiff
|
diff to current
2021-08-12
Takashi Sawanaka
- Fix an issue where the horizontal scrollbar was not...
blob
|
commitdiff
|
diff to current
2021-08-09
Takashi Sawanaka
Add /c command line option
blob
|
commitdiff
|
diff to current
2021-07-31
Takashi Sawanaka
- Move some CMergeEditVew::On* functions to CMergeDoc...
blob
|
commitdiff
|
diff to current
2021-07-22
Takashi Sawanaka
Add /fileext command line option
blob
|
commitdiff
|
diff to current
2021-07-17
Takashi Sawanaka
Move OnViewSwapPanesxx() functions from CMergeEditView...
blob
|
commitdiff
|
diff to current
2021-07-16
Takashi Sawanaka
Fix Code scanning alerts 691, 692, 695, 696: Inconsiste...
blob
|
commitdiff
|
diff to current
2021-07-15
Takashi Sawanaka
Improve plugin system (editor script) (#871)
blob
|
commitdiff
|
diff to current
2021-06-23
Takashi Sawanaka
Merge remote-tracking branch 'origin/master'
blob
|
commitdiff
|
diff to current
2021-06-23
Takashi Sawanaka
Fix 'No prediffer (normal)' menu item being marked...
blob
|
commitdiff
|
diff to current
2021-06-20
Takashi Sawanaka
Improve plugin system (#797)
blob
|
commitdiff
|
diff to current
2021-05-15
Takashi Sawanaka
theApp is unnecessary because these methods are a stati...
blob
|
commitdiff
|
diff to current
2021-05-09
Takashi Sawanaka
Fix the problem that the BS key does not work at the...
blob
|
commitdiff
|
diff to current
2021-04-28
Takashi Sawanaka
Fix 'Automatic Rescan' not working after splitting...
blob
|
commitdiff
|
diff to current
2021-04-21
Takashi Sawanaka
MergeEditView.cpp: Fix an issue where font size restora...
blob
|
commitdiff
|
diff to current
2021-04-21
Takashi Sawanaka
refactor
blob
|
commitdiff
|
diff to current
2021-04-20
Takashi Sawanaka
refactor
blob
|
commitdiff
|
diff to current
2021-04-20
Takashi Sawanaka
Add "Open Parent Folder" menu item to the file compare...
blob
|
commitdiff
|
diff to current
2021-04-18
Takashi Sawanaka
crystaledit: Use structured bindings
blob
|
commitdiff
|
diff to current
2021-04-18
Takashi Sawanaka
Implement GitHub #135: [Feature Request] Selection...
blob
|
commitdiff
|
diff to current
2021-04-17
Takashi Sawanaka
crystaledit: Make the characters that represent spaces...
blob
|
commitdiff
|
diff to current
2021-04-10
Takashi Sawanaka
Fix that the Next File or Previous File button on the...
blob
|
commitdiff
|
diff to current
2021-02-27
Takashi Sawanaka
Fix GitHub issue #645: Program crash if you close a...
blob
|
commitdiff
|
diff to current
2021-02-21
elsonwei
Add "Copy Selected Line(s) to/from Left/Right" feature...
blob
|
commitdiff
|
diff to current
2021-02-12
Jun Tajima
Add a feature to set up default highlighting by a file...
blob
|
commitdiff
|
diff to current
2021-02-11
Jun Tajima
Fix an issue where the syntax highlighting scheme is...
blob
|
commitdiff
|
diff to current
2021-02-07
Takashi Sawanaka
Fix sf.net #2237: The position selected by clicking...
blob
|
commitdiff
|
diff to current
2021-01-27
Takashi Sawanaka
Fix an issue where the Diff pane might not display...
blob
|
commitdiff
|
diff to current
2021-01-27
Takashi Sawanaka
Rename "Ignored Substitutions" to "Substitution Filters"
blob
|
commitdiff
|
diff to current
2021-01-26
Takashi Sawanaka
A new feature "Ignored Substitutions" (7)
blob
|
commitdiff
|
diff to current
2021-01-23
Takashi Sawanaka
MainFrm.cpp: Fix an issue where items are not displayed...
blob
|
commitdiff
|
diff to current
2021-01-17
ranjwarrior
Feature Request: Move To Next File option while compari...
blob
|
commitdiff
|
diff to current
2021-01-10
Takashi Sawanaka
Merge remote-tracking branch 'origin/stable'
blob
|
commitdiff
|
diff to current
2021-01-10
Takashi Sawanaka
Merge remote-tracking branch 'origin/stable'
blob
|
commitdiff
|
diff to current
2021-01-10
Takashi Sawanaka
Merge branch 'stable' of c:\dev\winmerge-stable
blob
|
commitdiff
|
diff to current
2021-01-08
Takashi Sawanaka
Merge pull request #545 from GreyMerlin/master
blob
|
commitdiff
|
diff to current
2021-01-08
EugeneLaptev
Added a new feature "Ignored Substitutions", which...
blob
|
commitdiff
|
diff to current
2021-01-08
EugeneSumo
Added a new feature "Ignored Substitutions", which...
blob
|
commitdiff
|
diff to current
2021-01-01
ranjwarrior
Swap Panes functionality for 3 way compares (https...
blob
|
commitdiff
|
diff to current
2021-01-01
Takashi Sawanaka
Fix Warning C26812: Prefer 'enum class' over 'enum...
blob
|
commitdiff
|
diff to current
2021-01-01
Takashi Sawanaka
Fix GitHub issue #531: WinMerge crashes with mouse...
blob
|
commitdiff
|
diff to current
2020-11-22
Jun Tajima
Add the feature "Go to Moved Line". (#484)
blob
|
commitdiff
|
diff to current
2020-11-21
Takashi Sawanaka
Fix GitHub issue #452: Automatically scroll to first...
blob
|
commitdiff
|
diff to current
2020-11-14
Jun Tajima
Fix the problem that "Goto...", "Goto Line <line>"...
blob
|
commitdiff
|
diff to current
2020-11-01
Takashi Sawanaka
Syntax-highlighter-based comment filter (Fix osdn.net...
blob
|
commitdiff
|
diff to current
2020-10-24
Takashi Sawanaka
Fix GitHub issue #452: Automatically scroll to first...
blob
|
commitdiff
|
diff to current
2020-10-24
Takashi Sawanaka
MergeEditView: Add SetActivePane() function
blob
|
commitdiff
|
diff to current
2020-10-18
SamuelPlentz
always copy "full line" instead of "selected text only...
blob
|
commitdiff
|
diff to current
2020-10-17
LMS
Merge pull request #8 from WinMerge/master
blob
|
commitdiff
|
diff to current
2020-10-13
Takashi Sawanaka
Display the dialog or menu associated with that positio...
blob
|
commitdiff
|
diff to current
2020-09-27
Takashi Sawanaka
Fix GitHub issue #265: how to show white space with...
blob
|
commitdiff
|
diff to current
2020-09-08
Takashi Sawanaka
Merge branch 'master' into master
blob
|
commitdiff
|
diff to current
2020-08-27
Takashi Sawanaka
MergeEditView.*: When scrolling with the horizontal...
blob
|
commitdiff
|
diff to current
2020-08-27
LMS
Merge pull request #7 from WinMerge/master
blob
|
commitdiff
|
diff to current
2020-08-12
Takashi Sawanaka
MergeEditView.cpp: Fix a warning
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
LMS
Merge pull request #6 from WinMerge/master
blob
|
commitdiff
|
diff to current
2020-07-28
Takashi Sawanaka
Merge branch 'master' into master
blob
|
commitdiff
|
diff to current
2020-07-26
Takashi Sawanaka
Merge pull request #384 from silid/master
blob
|
commitdiff
|
diff to current
2020-07-26
Takashi Sawanaka
Made it possible to display the contents of CSV and...
blob
|
commitdiff
|
diff to current
2020-06-30
Takashi Sawanaka
crystaledit: rename m_bColumnSelection to m_bRectangula...
blob
|
commitdiff
|
diff to current
2020-06-24
Takashi Sawanaka
crystaledit: Move TextDefinition and TextType to Crysta...
blob
|
commitdiff
|
diff to current
2020-06-08
Takashi Sawanaka
Merge pull request #360 from igorruckert/patch-1
blob
|
commitdiff
|
diff to current
2020-06-08
Takashi Sawanaka
Fix GitHub issue #358: Moved ghost lines are shown...
blob
|
commitdiff
|
diff to current
2020-05-20
LMS
Merge pull request #5 from WinMerge/master
blob
|
commitdiff
|
diff to current
2020-05-20
Takashi Sawanaka
MergeEditView.cpp: Fix crash when selecting Diff Contex...
blob
|
commitdiff
|
diff to current
2020-05-20
Takashi Sawanaka
Remove PluginForFile:m_bWithFile
blob
|
commitdiff
|
diff to current
2020-05-17
Takashi Sawanaka
Remove unused macros from editcmd.h
blob
|
commitdiff
|
diff to current
2020-05-16
Takashi Sawanaka
Use SPDX license identifier
blob
|
commitdiff
|
diff to current
2020-05-13
Takashi Sawanaka
Fix osdn.net ticket 40407: Fix a problem where markers...
blob
|
commitdiff
|
diff to current
2020-05-10
Takashi Sawanaka
Fix crash in Test
blob
|
commitdiff
|
diff to current
2020-05-07
Takashi Sawanaka
Fix Github issue #307(3): Diff Pane issues(2.)
blob
|
commitdiff
|
diff to current
2020-05-07
Takashi Sawanaka
Fix Github issue #307(2): Diff Pane issues(1.)
blob
|
commitdiff
|
diff to current
2020-04-09
Takashi Sawanaka
Fix Github issue #307: Diff Pane issues(1.)
blob
|
commitdiff
|
diff to current
2020-04-09
Takashi Sawanaka
Fix crash when selecting the Window->Split menu item...
blob
|
commitdiff
|
diff to current
2020-01-05
Takashi Sawanaka
Make it possible to select whether to close the main...
blob
|
commitdiff
|
diff to current
2019-12-10
Takashi Sawanaka
Merge branch 'master' of https://github.com/winmerge...
blob
|
commitdiff
|
diff to current
2019-12-10
Takashi Sawanaka
Fix an issue where the operation of changing the select...
blob
|
commitdiff
|
diff to current
2019-12-08
Takashi Sawanaka
Fix an issue where the operation of changing the select...
blob
|
commitdiff
|
diff to current
2019-11-24
Takashi Sawanaka
Add support for Color Emoji (WIP)
blob
|
commitdiff
|
diff to current
2019-09-03
Стоян Димитров
Merge remote-tracking branch 'upstream/master'
blob
|
commitdiff
|
diff to current
2019-09-01
Takashi Sawanaka
MergeEditView.cpp: Fix an issue where WinMerge couldn...
blob
|
commitdiff
|
diff to current
2019-07-04
Takashi Sawanaka
Reduce the size of the executable file (3)
blob
|
commitdiff
|
diff to current
2019-07-03
Takashi Sawanaka
Fix GitHub issue #159: file compare : right-click doesn...
blob
|
commitdiff
|
diff to current
2019-06-30
Takashi Sawanaka
Cppcheck: The scope of the variable '...' can be reduced
blob
|
commitdiff
|
diff to current
2019-06-16
Takashi Sawanaka
MergeEditView.cpp: When merging differences in the...
blob
|
commitdiff
|
diff to current
2019-06-09
Takashi Sawanaka
Convert out parameters to return value
blob
|
commitdiff
|
diff to current
2019-06-02
gandf
Merge pull request #2 from WinMerge/master
blob
|
commitdiff
|
diff to current
2019-05-19
Takashi Sawanaka
MergeEditView.cpp: When merging differences in the...
blob
|
commitdiff
|
diff to current
2019-04-14
Takashi Sawanaka
Merged in gerundt/winmerge (pull request #37)
blob
|
commitdiff
|
diff to current
2019-04-10
Takashi Sawanaka
MergeEditView.*: Add 'Shell Menu' menu item in context...
blob
|
commitdiff
|
diff to current
2019-04-06
Takashi Sawanaka
Rename CChlidFrame class to CMergeEditFrame class
blob
|
commitdiff
|
diff to current
2019-04-06
Takashi Sawanaka
Word-level merging did not work correctly if the number...
blob
|
commitdiff
|
diff to current
2019-03-31
Takashi Sawanaka
Merge
blob
|
commitdiff
|
diff to current
2019-03-31
Takashi Sawanaka
Change std::vector<T> output argument to return value
blob
|
commitdiff
|
diff to current
2019-03-30
Takashi Sawanaka
Merged in gerundt/winmerge (pull request #35)
blob
|
commitdiff
|
diff to current
2019-03-17
Takashi Sawanaka
FolderCompare: Display folder size
blob
|
commitdiff
|
diff to current
2019-02-17
Takashi Sawanaka
'Automatically scroll to first difference' option did...
blob
|
commitdiff
|
diff to current
2019-01-01
Takashi Sawanaka
Add support for merging word level diffs in selection.
blob
|
commitdiff
|
diff to current
next