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
Update copyright year
[winmerge-jp/winmerge-jp.git]
/
Src
/
DiffWrapper.h
2022-03-18
germanaizek
Better to use '= default;' for empty body
blob
|
commitdiff
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" (4)
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-01
Takashi Sawanaka
Fix Warning C26812: Prefer 'enum class' over 'enum...
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-25
Takashi Sawanaka
Fix GitHub issue #395: Bug: Line Filters aren't applied...
blob
|
commitdiff
|
diff to current
2020-07-28
Takashi Sawanaka
Merge branch 'master' into master
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-22
Takashi Sawanaka
Add "Enable image compare in folder compare" option...
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-13
Takashi Sawanaka
Avoid using memset() for structure initialization
blob
|
commitdiff
|
diff to current
2019-03-30
Takashi Sawanaka
Merged in gerundt/winmerge (pull request #35)
blob
|
commitdiff
|
diff to current
2019-03-10
Takashi Sawanaka
Delete bForceUTF8 argument that no longer makes sense
blob
|
commitdiff
|
diff to current
2018-10-28
Takashi Sawanaka
Merge pull request #101 from GreyMerlin/master
blob
|
commitdiff
|
diff to current
2018-10-28
GreyMerlin
Various refactorings involving NULL, ASSERT, TRUE and...
blob
|
commitdiff
|
diff to current
2018-01-03
Takashi Sawanaka
FolderCompare: Display whether 2 files in diff row...
blob
|
commitdiff
|
diff to current
2016-11-29
Takashi Sawanaka
Merge
2.14.0+-jp-122
blob
|
commitdiff
|
diff to current
2016-11-27
Takashi Sawanaka
Remove unused #include directives
blob
|
commitdiff
|
diff to current
2016-11-26
Takashi Sawanaka
FolderCompare.exe: make FolderCompare.exe buildable...
blob
|
commitdiff
|
diff to current
2016-11-19
Takashi Sawanaka
Merge
blob
|
commitdiff
|
diff to current
2016-08-14
Takashi Sawanaka
Cppcheck: Redundant assignment of 'Identical' to itself.
blob
|
commitdiff
|
diff to current
2016-08-13
Takashi Sawanaka
Use std::copy_n()
blob
|
commitdiff
|
diff to current
2016-04-09
Takashi Sawanaka
Compare result was not correct when using Synchronizati...
blob
|
commitdiff
|
diff to current
2015-11-28
sdottaka
Merge with default
blob
|
commitdiff
|
diff to current
2015-11-23
sdottaka
Avoid creating FilterCommentsManager object every times...
blob
|
commitdiff
|
diff to current
2015-02-20
sdottaka
Merge 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-01-16
sdottaka
Merge with stable
blob
|
commitdiff
|
diff to current
2015-01-16
sdottaka
FolderCompare: Add Binary Contents compare method
blob
|
commitdiff
|
diff to current
2014-11-29
sdottaka
Merge with stable
blob
|
commitdiff
|
diff to current
2014-11-28
sdottaka
Use std::unique_ptr/shared_ptr instead of boost::scoped...
blob
|
commitdiff
|
diff to current
2014-10-02
sdottaka
Merge with stable
blob
|
commitdiff
|
diff to current
2014-10-02
sdottaka
Constify some methods
blob
|
commitdiff
|
diff to current
2014-01-20
sdottaka
Merge with stable
blob
|
commitdiff
|
diff to current
2014-01-19
sdottaka
Fix 3way-diff algorithm that cannot detect conflict...
blob
|
commitdiff
|
diff to current
2014-01-18
sdottaka
Merge with stable
blob
|
commitdiff
|
diff to current
2014-01-18
sdottaka
* Use standard order of header files
blob
|
commitdiff
|
diff to current
2013-05-05
sdottaka
Separte diff3 algorithm from DiffWrapper.cpp and string...
blob
|
commitdiff
|
diff to current
2013-05-04
sdottaka
Avoid using 'delete' operator
blob
|
commitdiff
|
diff to current
2012-12-09
sdottaka
* Remove <windows.h> dependency from FilterCommentsMana...
blob
|
commitdiff
|
diff to current
2012-11-04
sdottaka
- Remove MFC dependency
blob
|
commitdiff
|
diff to current
2012-08-30
sdottaka
- Use Poco::RegularExpression instead of PCRE library...
blob
|
commitdiff
|
diff to current
2011-05-15
sdottaka
Fix mixed EOL
blob
|
commitdiff
|
diff to current
2011-04-28
sdottaka
Merge rev.7791
blob
|
commitdiff
|
diff to current
2011-01-08
sdottaka
Merge Tim's fix-x64-warnings-in-bcmenu patch
blob
|
commitdiff
|
diff to current
2011-01-08
sdottaka
Merge from rev.7448
blob
|
commitdiff
|
diff to current
2010-08-31
Kimmo Varis
PATCH: #3046938 Improvement in Folder comparison
blob
|
commitdiff
|
diff to current
2010-07-04
Jochen Tucht
Make DIFFRANGE::op and respective function parameters...
blob
|
commitdiff
|
diff to current
2010-06-29
sdottaka
Merge from rev.7205
blob
|
commitdiff
|
diff to current
2010-06-27
sdottaka
Merge from rev. 7160
blob
|
commitdiff
|
diff to current
2010-06-08
saitaman
Issue2:コメントの差異を無視する機能がただしく動作しない?
blob
|
commitdiff
|
diff to current
2010-05-23
sdottaka
Merge from rev.7128:7151
blob
|
commitdiff
|
diff to current
2010-05-02
sdottaka
Merge from rev.7121:7123
blob
|
commitdiff
|
diff to current
2010-04-29
sdottaka
Merge from rev.7103:7118
blob
|
commitdiff
|
diff to current
2010-04-18
sdottaka
Apply my experimental code and fixes for Japanese MS...
2.13.11+-jp-8
blob
|
commitdiff
|
diff to current
2010-01-11
Kimmo Varis
Cleanup. Remove unused return value from method.
blob
|
commitdiff
|
diff to current
2009-12-31
Kimmo Varis
PATCH: [ 2922517 ] panes gets unaligned if differs...
blob
|
commitdiff
|
diff to current
2009-06-25
Kimmo Varis
Remove couple of CString uses.
blob
|
commitdiff
|
diff to current
2008-08-13
Marcel Gosselin
Use bool/true/false instead of BOOL/TRUE/FALSE in some...
blob
|
commitdiff
|
diff to current
2008-07-09
Kimmo Varis
PATCH: [ 2013845 ] Add option to enable plugins (disabl...
blob
|
commitdiff
|
diff to current
2008-06-07
Kimmo Varis
PATCH: [ 1985997 ] Remove unnecessary #ifndef around...
blob
|
commitdiff
|
diff to current
2008-02-11
Takashi Sawanaka
BUG: [ 1880628 ] LineFilter doesn't filter out non...
blob
|
commitdiff
|
diff to current
2007-10-14
Jochen Tucht
Patch #1804762 continued
blob
|
commitdiff
|
diff to current
2007-02-01
Kimmo Varis
PATCH: [ 1650043 ] Convert CDiffWrapper to use CompareO...
blob
|
commitdiff
|
diff to current
2007-01-31
Kimmo Varis
PATCH: [ 1648182 ] Separate Compare options from DiffWr...
blob
|
commitdiff
|
diff to current
2007-01-08
Kimmo Varis
PATCH: [ 1593810 ] Line-filtering post compare
blob
|
commitdiff
|
diff to current
2006-12-05
Kimmo Varis
PATCH: [ 1608846 ] Create a class for moved blocks
blob
|
commitdiff
|
diff to current
2006-09-20
Kimmo Varis
PATCH: [ 1561650 ] Separate FilterCommentsManager code...
blob
|
commitdiff
|
diff to current
2006-08-23
Kimmo Varis
PATCH: [ 1544777 ] Compare by size
blob
|
commitdiff
|
diff to current
2006-08-11
Kimmo Varis
PATCH: [ 1538264 ] Split DiffFileData class to own...
blob
|
commitdiff
|
diff to current
2006-07-28
Kimmo Varis
PATCH: [ 1529599 ] Cleanup DiffWrapper
blob
|
commitdiff
|
diff to current
2006-07-24
Kimmo Varis
PATCH: [ 1526918 ] Detect which side file is binary...
blob
|
commitdiff
|
diff to current
2006-07-13
Kimmo Varis
PATCH: [ 1517057 ] Option to Ignore Multiline Comments...
blob
|
commitdiff
|
diff to current
2006-07-12
Kimmo Varis
PATCH: [ 1517057 ] Option to Ignore Multiline Comments
blob
|
commitdiff
|
diff to current
2006-05-31
Kimmo Varis
PATCH: [ 1483544 ] New compare method: by date and...
blob
|
commitdiff
|
diff to current
2006-04-05
Kimmo Varis
PATCH: [ 1460749 ] Print relative paths to patch files
blob
|
commitdiff
|
diff to current
2006-03-22
Kimmo Varis
PATCH: [ 1406944 ] Compute text statistics in QuickCompare
blob
|
commitdiff
|
diff to current
2006-02-08
Perry Rapp
PATCH: [ 1426552 ] Add selftests between platform versions
blob
|
commitdiff
|
diff to current
2006-01-07
Perry Rapp
PATCH: [ 1398959 ] Implement GuessEncoding in QuickCompare
blob
|
commitdiff
|
diff to current
2005-12-30
Perry Rapp
PATCH: [ 1393239 ] Split functions out of RunFileDiff
blob
|
commitdiff
|
diff to current
2005-12-30
Perry Rapp
PATCH: [ 1212368 ] Display correct paths in context...
blob
|
commitdiff
|
diff to current
2005-12-29
Perry Rapp
PATCH: [ 1392650 ] Fix locals of CDiffWrapper::RunFileDiff
blob
|
commitdiff
|
diff to current
2005-12-19
Perry Rapp
PATCH: [ 1384181 ] Fix byte difference fencepost/infin...
blob
|
commitdiff
|
diff to current
2005-12-10
Perry Rapp
PATCH: [ 1373020 ] Carry unicoding, codepage, & file...
blob
|
commitdiff
|
diff to current
2005-11-22
Perry Rapp
PATCH: [ 1334277 ] Show asterisk in #diffs for QuickCom...
blob
|
commitdiff
|
diff to current
2005-08-26
Kimmo Varis
PATCH: [ 1267510 ] Allow stopping quick compare after...
blob
|
commitdiff
|
diff to current
2005-08-25
Perry Rapp
PATCH: [ 1269567 ] Abortable quick compare
blob
|
commitdiff
|
diff to current
2005-07-22
Perry Rapp
2005-07-22 Perry
blob
|
commitdiff
|
diff to current
2005-07-21
Perry Rapp
2005-07-21 Perry
blob
|
commitdiff
|
diff to current
2005-07-08
Kimmo Varis
PATCH: [ 1234390 ] Compare >2 MB files with quick contents
blob
|
commitdiff
|
diff to current
2005-05-08
Perry Rapp
2005-05-08 Perry
blob
|
commitdiff
|
diff to current
next