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
PATCH [ 922724 ] "Don't display again" option for messageboxes
[winmerge-jp/winmerge-jp.git]
/
Src
/
MergeDoc.cpp
2004-03-30
Laurent Ganier
PATCH [ 922724 ] "Don't display again" option for messa...
blob
|
commitdiff
2004-03-29
Laurent Ganier
BUG [ 925202 ] broken feature: after save error, save...
blob
|
commitdiff
|
diff to current
2004-03-23
Kimmo Varis
PATCH: [ 921440 ] UI option for detecting moved blocks
blob
|
commitdiff
|
diff to current
2004-03-22
Kimmo Varis
BUG: [ 920965 ] Merging moved block messes up linecolors
blob
|
commitdiff
|
diff to current
2004-03-19
Perry Rapp
PATCH: [ 891498 ] moved block detection
blob
|
commitdiff
|
diff to current
2004-03-12
Kimmo Varis
PATCH: [ 902191 ] Uninline CDiffTextBuffer functions
blob
|
commitdiff
|
diff to current
2004-03-11
Kimmo Varis
PATCH: [ 913792 ] Cache color options for MergeView
blob
|
commitdiff
|
diff to current
2004-03-08
Kimmo Varis
PATCH: [ 892397 ] Distinguish prediffer from unpacker...
blob
|
commitdiff
|
diff to current
2004-03-07
Kimmo Varis
PATCH: [ 911114 ] DiffOptions to new system
blob
|
commitdiff
|
diff to current
2004-03-05
Kimmo Varis
Two unrelated lines got removed by checkin of #909980
blob
|
commitdiff
|
diff to current
2004-03-05
Kimmo Varis
PATCH: [ 909980 ] Fix buffer types and descriptions
blob
|
commitdiff
|
diff to current
2004-03-04
Kimmo Varis
PATCH: [ 907898 ] Detect filechange by another app...
blob
|
commitdiff
|
diff to current
2004-02-28
Kimmo Varis
PATCH: [ 906224 ] Convert more options to new system
blob
|
commitdiff
|
diff to current
2004-02-21
Kimmo Varis
PATCH: [ 896153 ] OptionsManager
blob
|
commitdiff
|
diff to current
2004-02-20
Kimmo Varis
PATCH: [ 899926 ] Write LogErrorString()s to logfile
blob
|
commitdiff
|
diff to current
2004-02-16
Kimmo Varis
PATCH: [ 891364 ] Enumerated doctype (scratchpads)
blob
|
commitdiff
|
diff to current
2004-02-07
Laurent Ganier
BUG: [ 892158 ] Empty lines added to end of file
blob
|
commitdiff
|
diff to current
2004-02-03
Perry Rapp
PATCH: [ 882683 ] Combine transform code in DirScan.cpp
blob
|
commitdiff
|
diff to current
2004-02-03
Kimmo Varis
PATCH: [ 889334 ] Improve and enable logging
blob
|
commitdiff
|
diff to current
2004-02-01
Kimmo Varis
Remove some unused variables
blob
|
commitdiff
|
diff to current
2004-02-01
Kimmo Varis
PATCH: [ 887085 ] CMergeDoc::TrySaveAs() cleanup
blob
|
commitdiff
|
diff to current
2004-01-31
Laurent Ganier
BUG: [ 885018 ] Crash when trying to save scratchpad
blob
|
commitdiff
|
diff to current
2004-01-29
Kimmo Varis
PATCH: [ 885092 ] CMergeDoc::DoSave() cleanup
blob
|
commitdiff
|
diff to current
2004-01-23
Kimmo Varis
PATCH: [ 881602 ] Don't allow canceling saving when...
blob
|
commitdiff
|
diff to current
2004-01-19
Perry Rapp
PATCH: [ 880046 ] Save every line including last one...
blob
|
commitdiff
|
diff to current
2004-01-17
Kimmo Varis
PATCH: [ 876556 ] (Minor) code cleanup for SaveToFile...
blob
|
commitdiff
|
diff to current
2004-01-14
Perry Rapp
PATCH: [ 876546 ] Fix CMergeDoc::CDiffTextBuffer::SaveT...
blob
|
commitdiff
|
diff to current
2004-01-11
Perry Rapp
PATCH: [ 860054 ] Reimplement SaveToFile using stream...
blob
|
commitdiff
|
diff to current
2004-01-09
Kimmo Varis
Fix parameter type, CMergeDoc::TrySaveAs() second param...
blob
|
commitdiff
|
diff to current
2003-12-11
Laurent Ganier
[ 853147 ] New class for text conversion in plugins
blob
|
commitdiff
|
diff to current
2003-12-10
Perry Rapp
Add comment inside CMergeDoc::CDiffTextBuffer::SaveToFi...
blob
|
commitdiff
|
diff to current
2003-11-26
Kimmo Varis
PATCH: [ 848955 ] Don't ask about saving after user...
blob
|
commitdiff
|
diff to current
2003-11-25
Kimmo Varis
Missed one diff in PATCH: [ 847697 ] Move desc texts...
blob
|
commitdiff
|
diff to current
2003-11-25
Perry Rapp
[ 846405 ] Highlight individual word diffs in line
blob
|
commitdiff
|
diff to current
2003-11-24
Kimmo Varis
PATCH: [ 847697 ] Move desc texts into doc classes
blob
|
commitdiff
|
diff to current
2003-11-23
Laurent Ganier
typo in TrySaveAs and merge error in DoSave
blob
|
commitdiff
|
diff to current
2003-11-22
Kimmo Varis
PATCH: [ 820676 ] Scratchpad
blob
|
commitdiff
|
diff to current
2003-11-22
Perry Rapp
PATCH: [ 844780 ] MergeDoc code cleanup (removed Asser...
blob
|
commitdiff
|
diff to current
2003-11-21
Laurent Ganier
SaveToFile : returned value ; cosmetic in TrySaveAs...
blob
|
commitdiff
|
diff to current
2003-11-19
Laurent Ganier
[ 845196 ] UTF-8 files not correctly compared
blob
|
commitdiff
|
diff to current
2003-11-19
Laurent Ganier
BUG: [ 845012 ] SaveToFile does not write BOM
blob
|
commitdiff
|
diff to current
2003-11-16
Perry Rapp
PATCH: [ 841897 ] Bail out of LoadFromFile if see embed...
blob
|
commitdiff
|
diff to current
2003-11-15
Perry Rapp
PATCH: [ 841878 ] Fix wchar to char conversions at...
blob
|
commitdiff
|
diff to current
2003-11-14
Laurent Ganier
[ 840296 ] Informative messageboxes when loading files
blob
|
commitdiff
|
diff to current
2003-11-12
Laurent Ganier
PATCH: [ 838354 ] Revisit Speedup Speed up display...
blob
|
commitdiff
|
diff to current
2003-11-11
Laurent Ganier
avoid double message "no line difference"
blob
|
commitdiff
|
diff to current
2003-11-11
Laurent Ganier
PATCH: [ 838530 ] Simplify GhostTextBuffer for Undo
blob
|
commitdiff
|
diff to current
2003-11-11
Laurent Ganier
PATCH: [ 839970 ] Moving from LoadFromFile to OpenDocs...
blob
|
commitdiff
|
diff to current
2003-11-11
Laurent Ganier
[ 839243 ] F4 should hilight diff in both files
blob
|
commitdiff
|
diff to current
2003-11-11
Laurent Ganier
fix for syntax highlight in left pane view
blob
|
commitdiff
|
diff to current
2003-11-08
Perry Rapp
PATCH: [ 838283 ] Simplifiy OnFileSave
blob
|
commitdiff
|
diff to current
2003-11-07
Laurent Ganier
BUG: [ 837980 ] bug in save right as
blob
|
commitdiff
|
diff to current
2003-11-07
Kimmo Varis
BUG: [ 837760 ] regression since 2.1.3.6 (diff array)
blob
|
commitdiff
|
diff to current
2003-11-06
Kimmo Varis
PATCH: [ 836714 ] Separate counts of normal and trivial...
blob
|
commitdiff
|
diff to current
2003-11-03
Laurent Ganier
[ 834122 ] Add Error Handling around calls to plug-ins
blob
|
commitdiff
|
diff to current
2003-11-02
Kimmo Varis
BUG: (part of) [ 829435 ] Fix character classification...
blob
|
commitdiff
|
diff to current
2003-11-01
Kimmo Varis
Fix signed/unsigned clashes
blob
|
commitdiff
|
diff to current
2003-10-31
Kimmo Varis
Removing unused variables
blob
|
commitdiff
|
diff to current
2003-10-30
Laurent Ganier
PATCH: [ 830132 ] open empty file
blob
|
commitdiff
|
diff to current
2003-10-26
Laurent Ganier
[ 827332 ] detach buffer during load and rescan
blob
|
commitdiff
|
diff to current
2003-10-25
Perry Rapp
PATCH: [ 826584 ] User-specified codepage conversions
blob
|
commitdiff
|
diff to current
2003-10-24
Perry Rapp
Add byte counts, and remove doubled line returns for...
blob
|
commitdiff
|
diff to current
2003-10-24
Perry Rapp
PATCH: [ 814832 ] Timing traces for loading file
blob
|
commitdiff
|
diff to current
2003-10-24
Perry Rapp
BUG: [ 827996 ] isspace uses (-> _istspace)
blob
|
commitdiff
|
diff to current
2003-10-23
Perry Rapp
BUG: [ 829306 ] Fix unifile code to append last line
blob
|
commitdiff
|
diff to current
2003-10-23
Laurent Ganier
PATCH: [ 827615 ] Speed up display of large differences...
blob
|
commitdiff
|
diff to current
2003-10-23
Perry Rapp
PATCH: [ 826250 ] New UniMemFile class for memory-mapping
blob
|
commitdiff
|
diff to current
2003-10-21
Laurent Ganier
PATCH: [ 826048 ] headerbar improvements
blob
|
commitdiff
|
diff to current
2003-10-20
Laurent Ganier
'Comparison Summary' not updated after saving (lost...
blob
|
commitdiff
|
diff to current
2003-10-19
Perry Rapp
PATCH: [ 818427 ] Fix hashing for mac lines and "ignore...
blob
|
commitdiff
|
diff to current
2003-10-17
Laurent Ganier
[ 807263 ] Preprocessing patch
blob
|
commitdiff
|
diff to current
2003-10-15
Kimmo Varis
PATCH: [ 823382 ] Save As should update filename
blob
|
commitdiff
|
diff to current
2003-10-13
Laurent Ganier
PATCH: [ 821821 ] Merge multiple diffs
blob
|
commitdiff
|
diff to current
2003-10-09
Laurent Ganier
[ 819219 ] Show only simple EOL char when no mixing...
blob
|
commitdiff
|
diff to current
2003-10-08
Laurent Ganier
[ 818198 ] Colors for "ignore blank lines"
blob
|
commitdiff
|
diff to current
2003-10-07
Perry Rapp
PATCH: [ 817502 ] Fix "ignore blank lines"
blob
|
commitdiff
|
diff to current
2003-10-05
Kimmo Varis
Show text "Identical" on diffnumber panel when files...
blob
|
commitdiff
|
diff to current
2003-10-04
Laurent Ganier
Undo last changes related to PATCH: [ 813794 ] Fix...
blob
|
commitdiff
|
diff to current
2003-10-03
Laurent Ganier
two minor changes for PATCH: [ 813794 ] Fix "ignore...
blob
|
commitdiff
|
diff to current
2003-10-03
Laurent Ganier
two minor changes for PATCH: [ 813794 ] Fix "ignore...
blob
|
commitdiff
|
diff to current
2003-10-03
Perry Rapp
PATCH: [ 813794 ] Fix "ignore blank lines"
blob
|
commitdiff
|
diff to current
2003-10-02
Kimmo Varis
PATCH: [ 815138 ] Commandline filedescriptors
blob
|
commitdiff
|
diff to current
2003-09-30
Perry Rapp
PATCH: [ 813847 ] Fix Unicode double copy
blob
|
commitdiff
|
diff to current
2003-09-27
Perry Rapp
PATCH: [ 809149 ] Handle Unicode files
blob
|
commitdiff
|
diff to current
2003-09-22
Kimmo Varis
PATCH: [ 810066 ] Add Save Left (as...) and Save Right...
blob
|
commitdiff
|
diff to current
2003-09-22
Kimmo Varis
PATCH: [ 809902 ] Show if file is changed
blob
|
commitdiff
|
diff to current
2003-09-18
Kimmo Varis
BUG: [ 800256 ] Hilight line diff does not scroll to...
blob
|
commitdiff
|
diff to current
2003-09-16
Laurent Ganier
BUG [ 807402 ] ListCopy problem for Unix Files
blob
|
commitdiff
|
diff to current
2003-09-15
Perry Rapp
PATCH: [ 805888 ] Unicode compile of WinMerge
blob
|
commitdiff
|
diff to current
2003-09-15
Perry Rapp
PATCH: [ 805427 ] Delete unused CStdioFile variable...
blob
|
commitdiff
|
diff to current
2003-09-11
Laurent Ganier
[ 797821 ] GUI for the file EOL option
blob
|
commitdiff
|
diff to current
2003-09-07
Laurent Ganier
[ 799464 ] preserve positions during Rescan (2.1)
blob
|
commitdiff
|
diff to current
2003-08-31
Laurent Ganier
correction for the patch [797741] in CMergeDoc::CDiffTe...
blob
|
commitdiff
|
diff to current
2003-08-31
Kimmo Varis
PATCH: [ 797741 ] Faster file loading
blob
|
commitdiff
|
diff to current
2003-08-30
Laurent Ganier
[ 784109 ] layout with two new horizontal panels
blob
|
commitdiff
|
diff to current
2003-08-29
Kimmo Varis
PATCH: [ 796756 ] Diff API
blob
|
commitdiff
|
diff to current
2003-08-27
Kimmo Varis
PATCH: [ 784302 ] Implement Read-only for files and...
blob
|
commitdiff
|
diff to current
2003-08-25
Laurent Ganier
[ 783507 ] normalize replaceSelection and ListCopy
blob
|
commitdiff
|
diff to current
2003-08-24
Kimmo Varis
PATCH: [ 792668 ] Move file load code to CMergeDoc
blob
|
commitdiff
|
diff to current
2003-08-23
Perry Rapp
PATCH: [ 781529 ] Make column info array, and add new...
blob
|
commitdiff
|
diff to current
next