git.osdn.net Git - winmerge-jp/winmerge-jp.git/history

(root) / winmerge-jp / winmerge-jp.git / history

[winmerge-jp/winmerge-jp.git] / Src / MergeDoc.cpp

2021-05-09	Takashi Sawanaka	MergeDoc.cpp: Avoid unpacking the file on the right...	blob \| commitdiff
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
2020-03-21	Takashi Sawanaka	Fix an issue where EOL differences are highlighted...	blob \| commitdiff \| diff to current
2020-01-19	Takashi Sawanaka	Fix osdn issue #39924: An error message is shown when...	blob \| commitdiff \| diff to current
2019-12-21	Takashi Sawanaka	Fix issue where active pane is not restored correctly	blob \| commitdiff \| diff to current
2019-10-24	Стоян Димитров	Merge remote-tracking branch 'upstream/master'	blob \| commitdiff \| diff to current
2019-10-15	Tichij	Merge branch 'master' of https://github.com/WinMerge...	blob \| commitdiff \| diff to current
2019-10-01	Takashi Sawanaka	Fix GitHub issue #191: "Recompare as" menu option doesn...	blob \| commitdiff \| diff to current
2019-10-01	Takashi Sawanaka	Merge branch 'master' of https://github.com/winmerge...	blob \| commitdiff \| diff to current
2019-10-01	Takashi Sawanaka	Fix GitHub issue #191: "Recompare as" menu option doesn...	blob \| commitdiff \| diff to current
2019-09-12	Takashi Sawanaka	Fix GitHub issue #180: Performance using Unpacker	blob \| commitdiff \| diff to current
2019-09-03	Стоян Димитров	Merge remote-tracking branch 'upstream/master'	blob \| commitdiff \| diff to current
2019-09-01	Takashi Sawanaka	MergeDoc.cpp: Fixes an issue where the command line...	blob \| commitdiff \| diff to current
2019-09-01	Takashi Sawanaka	Fix a crash when merging selections if the last line...	blob \| commitdiff \| diff to current
2019-07-04	Takashi Sawanaka	Reduce the size of the executable file (3)	blob \| commitdiff \| diff to current
2019-06-02	Takashi Sawanaka	Merge branch 'master' of https://github.com/gandf/winme...	blob \| commitdiff \| diff to current
2019-06-02	gandf	Merge pull request #2 from WinMerge/master	blob \| commitdiff \| diff to current
2019-05-31	Tim Gerundt	File report: Fix a problem without showing line numbers	blob \| commitdiff \| diff to current
2019-05-29	Tim Gerundt	File report: Add a border on table level	blob \| commitdiff \| diff to current
2019-05-29	Tim Gerundt	File report: Tweak line numbers padding	blob \| commitdiff \| diff to current
2019-05-28	Tim Gerundt	Use line number instead "." as link in file report	blob \| commitdiff \| diff to current
2019-05-28	Tim Gerundt	Use "colspan" for file report titles	blob \| commitdiff \| diff to current
2019-05-28	Tim Gerundt	Drop "border" <div> from HTML reports	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	MergeDoc.cpp: 'Copy All To Left/right' did not work...	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	MergeDoc.cpp: Fix mixed eol-style	blob \| commitdiff \| diff to current
2019-03-30	Takashi Sawanaka	Merged in gerundt/winmerge (pull request #35)	blob \| commitdiff \| diff to current
2019-03-14	Takashi Sawanaka	word level diff dit not work if the text contains NUL...	blob \| commitdiff \| diff to current
2019-03-13	Takashi Sawanaka	Fix crash when failed to load file	blob \| commitdiff \| diff to current
2019-03-10	Takashi Sawanaka	Delete bForceUTF8 argument that no longer makes sense	blob \| commitdiff \| diff to current
2019-03-10	Takashi Sawanaka	MergeDoc.cpp: 'Copy All To Left/right' did not work...	blob \| commitdiff \| diff to current
2019-03-10	Takashi Sawanaka	Remove IF_IS_TRUE_ALL macro	blob \| commitdiff \| diff to current
2019-02-24	Takashi Sawanaka	Use COptionsMgr instead of GetProfile*() and WriteProfi...	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 Sawanaka	Merge ... Timon34/russianpo-edited-online-with-bitbucke...	blob \| commitdiff \| diff to current
2019-01-27	Takashi Sawanaka	MergeDoc.cpp: Recover lost compatibility	blob \| commitdiff \| diff to current
2019-01-22	Takashi Sawanaka	MergeDoc.cpp: If the command line option /x is specifie...	blob \| commitdiff \| diff to current
2019-01-20	Takashi Sawanaka	Delay calling InitialUpdateFrame() to reduce unnecessar...	blob \| commitdiff \| diff to current
2019-01-14	Takashi Sawanaka	MainFrm.h: Fix a problem which the size of header paths...	blob \| commitdiff \| diff to current
2019-01-12	Takashi Sawanaka	Fix "Assertion failed: dr.begin[0] == dr.begin[file...	blob \| commitdiff \| diff to current
2019-01-05	GreyMerlin	Additional low-level cleanups (5)	blob \| commitdiff \| diff to current
next

RSS Atom

About OSDN

Find Software

Develop Software

Help