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
Keep hidden items (#1377)
[winmerge-jp/winmerge-jp.git]
/
Src
/
MergeDoc.cpp
2022-06-07
Takashi Sawanaka
Fix issue #1363: Crash on command line compare
blob
|
commitdiff
2022-05-14
Takashi Sawanaka
Modify "Tools - Generate Report" (Add column width...
blob
|
commitdiff
|
diff to current
2022-05-13
stonee-K
Modify "Tools - Generate Report" (Add column width...
blob
|
commitdiff
|
diff to current
2022-05-09
Takashi Sawanaka
Fix osdn.net ticket #44522: CompareMSExcelFiles Plugins...
blob
|
commitdiff
|
diff to current
2022-04-24
Takashi Sawanaka
Webpage Compare [EXPERIMENTAL] (#1182)
blob
|
commitdiff
|
diff to current
2022-04-22
Takashi Sawanaka
Reduce unnecessary copying
blob
|
commitdiff
|
diff to current
2022-03-27
Takashi Sawanaka
Add URL handler plugins (#1270)
blob
|
commitdiff
|
diff to current
2022-03-19
Takashi Sawanaka
Revert some of the fixes in PR #1258
blob
|
commitdiff
|
diff to current
2022-03-18
germanaizek
More lower scope optimization and add const ref params
blob
|
commitdiff
|
diff to current
2022-03-18
germanaizek
Usage std::move(), replace ' = ""; ' to '.clear()'...
blob
|
commitdiff
|
diff to current
2022-03-17
Takashi Sawanaka
Make separator configuable in the "Recompare As →Table...
blob
|
commitdiff
|
diff to current
2022-01-19
Takashi Sawanaka
Fix for https://github.com/WinMerge/winmerge/discussion...
blob
|
commitdiff
|
diff to current
2022-01-16
Takashi Sawanaka
Fix issue #960: [Feature Request] Lengthen title of...
blob
|
commitdiff
|
diff to current
2021-12-24
Takashi Sawanaka
Fix a problem that 'Encountered an improper argument...
blob
|
commitdiff
|
diff to current
2021-11-25
Takashi Sawanaka
Fix #1056: Please add a huge icon for "Filter is active"
blob
|
commitdiff
|
diff to current
2021-11-21
Takashi Sawanaka
Make the 'Match similar lines' option work for 3-way...
blob
|
commitdiff
|
diff to current
2021-11-14
Takashi Sawanaka
Fix issue #1050: The current pane switches without...
blob
|
commitdiff
|
diff to current
2021-11-06
Takashi Sawanaka
Improve 'Match similar lines' (related to the issue...
blob
|
commitdiff
|
diff to current
2021-10-28
evoc
Added option "Ignore numbers" (#1025)
blob
|
commitdiff
|
diff to current
2021-09-25
Takashi Sawanaka
Fix issue #983: Plugin unpacked file extension problem...
blob
|
commitdiff
|
diff to current
2021-09-22
Takashi Sawanaka
Fix issue #951: Reloading a file that was changed by...
blob
|
commitdiff
|
diff to current
2021-09-17
Takashi Sawanaka
Fix osdn.net #42862: When the Diff pane was redisplayed...
blob
|
commitdiff
|
diff to current
2021-08-28
Takashi Sawanaka
Fix issue #940: Replace slow (4)
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-31
Takashi Sawanaka
Fix mouse cursor not being in Wait state when loading...
blob
|
commitdiff
|
diff to current
2021-07-25
Takashi Sawanaka
Allow escape sequences such as \t, \x09 or strings...
blob
|
commitdiff
|
diff to current
2021-07-22
Takashi Sawanaka
Add /fileext command line option
blob
|
commitdiff
|
diff to current
2021-07-18
Takashi Sawanaka
Add /table-delimiter, /table-quote and /table-allownewl...
blob
|
commitdiff
|
diff to current
2021-07-17
Takashi Sawanaka
Move OnViewSwapPanesxx() functions from CMergeEditView...
blob
|
commitdiff
|
diff to current
2021-07-17
Takashi Sawanaka
Implement osdn.net #41528: command line option that...
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-21
Takashi Sawanaka
Improve plugin system (#797) (4)
blob
|
commitdiff
|
diff to current
2021-06-20
Takashi Sawanaka
Improve plugin system (#797) (2)
blob
|
commitdiff
|
diff to current
2021-06-20
Takashi Sawanaka
Improve plugin system (#797)
blob
|
commitdiff
|
diff to current
2021-06-16
Takashi Sawanaka
Determine the language of syntax highlighting with...
blob
|
commitdiff
|
diff to current
2021-05-23
Takashi Sawanaka
Fix the problem that the edited contents are discarded...
blob
|
commitdiff
|
diff to current
2021-05-16
Takashi Sawanaka
Make Unpacker plugins available for image compare and...
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
MergeDoc.cpp: If an Encoding Error occurs when reading...
blob
|
commitdiff
|
diff to current
2021-05-09
Takashi Sawanaka
MergeDoc.cpp: Avoid unpacking the file on the right...
blob
|
commitdiff
|
diff to current
2021-05-05
Takashi Sawanaka
GuessCodepageEncoding() -> codepage_detect::Guess()
blob
|
commitdiff
|
diff to current
2021-04-30
Jun Tajima
Fix an issue where the message "The number of automatic...
blob
|
commitdiff
|
diff to current
2021-04-28
Takashi Sawanaka
Fix 'Automatic Rescan' not working after splitting...
blob
|
commitdiff
|
diff to current
2021-03-14
Takashi Sawanaka
Make it possible to specify the file type in the "Selec...
blob
|
commitdiff
|
diff to current
2021-02-21
Takashi Sawanaka
Add "Copy Selected Line(s) to/from Left/Right" feature...
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-01-28
Takashi Sawanaka
A new feature "Ignored Substitutions" (10)
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-26
Takashi Sawanaka
A new feature "Ignored Substitutions" (2) (#560)
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-02
Takashi Sawanaka
refactor
blob
|
commitdiff
|
diff to current
2021-01-02
Takashi Sawanaka
Fix command line option / x not working for binary...
blob
|
commitdiff
|
diff to current
2021-01-02
Takashi Sawanaka
Fix the scrolling position of the inactive window somet...
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 some warnings
blob
|
commitdiff
|
diff to current
2020-12-31
Takashi Sawanaka
Add View->Diff Context->Invert menu item
blob
|
commitdiff
|
diff to current
2020-12-31
Takashi Sawanaka
MergeDoc.cpp: Remove unused variables
blob
|
commitdiff
|
diff to current
2020-12-05
Takashi Sawanaka
Fixed the message box "The report has been created...
blob
|
commitdiff
|
diff to current
2020-11-30
Takashi Sawanaka
Fixed some untranslated strings
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-26
Takashi Sawanaka
Update English.pot (2)
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
Takashi Sawanaka
Merge pull request #458 from qosobrin/master
blob
|
commitdiff
|
diff to current
2020-10-18
Takashi Sawanaka
Merge pull request #457 from tjmprm77/feature/sync_poin...
blob
|
commitdiff
|
diff to current
2020-10-17
LMS
Merge pull request #8 from WinMerge/master
blob
|
commitdiff
|
diff to current
2020-10-17
Jun Tajima
Fix the problem accessing the text buffer out of range...
blob
|
commitdiff
|
diff to current
2020-09-22
Takashi Sawanaka
Merge pull request #435 from tjmprm77/feature/sync_poin...
blob
|
commitdiff
|
diff to current
2020-09-22
Jun Tajima
Fix the problem that the comparison result is displayed...
blob
|
commitdiff
|
diff to current
2020-09-08
Takashi Sawanaka
Merge branch 'master' into master
blob
|
commitdiff
|
diff to current
2020-08-27
LMS
Merge pull request #7 from WinMerge/master
blob
|
commitdiff
|
diff to current
2020-08-16
Takashi Sawanaka
Fix a bug where the title of the tabs in the file compa...
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-27
Takashi Sawanaka
Fix GitHub issue #362: opening same file (2)
blob
|
commitdiff
|
diff to current
2020-06-24
Takashi Sawanaka
crystaledit: Move TextDefinition and TextType to Crysta...
blob
|
commitdiff
|
diff to current
2020-06-14
Takashi Sawanaka
Fix GitHub issue #362: opening same file
blob
|
commitdiff
|
diff to current
2020-06-10
Takashi Sawanaka
Fix an issue where the cursor would move to the beginni...
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-24
Takashi Sawanaka
Fix GitHub issue #351: Crush-report.
blob
|
commitdiff
|
diff to current
2020-05-20
LMS
Merge pull request #5 from WinMerge/master
blob
|
commitdiff
|
diff to current
2020-05-16
Takashi Sawanaka
Use SPDX license identifier
blob
|
commitdiff
|
diff to current
2020-04-25
LMS
Merge pull request #2 from WinMerge/master
blob
|
commitdiff
|
diff to current
2020-04-25
Takashi Sawanaka
Fix GitHub issue #320: Codepage not updated on refresh
blob
|
commitdiff
|
diff to current
2020-04-01
Takashi Sawanaka
Fix GitHub issue #297: Allow specifying default for...
blob
|
commitdiff
|
diff to current
2020-03-29
Takashi Sawanaka
- Add Solarized Dark/Light color scheme
blob
|
commitdiff
|
diff to current
next