OSDN Git Service
(root)
/
winmerge-jp
/
winmerge-jp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2f6e944
)
Fix issue #1363: Crash on command line compare
author
Takashi Sawanaka
<sdottaka@users.sourceforge.net>
Tue, 7 Jun 2022 13:14:47 +0000
(22:14 +0900)
committer
Takashi Sawanaka
<sdottaka@users.sourceforge.net>
Tue, 7 Jun 2022 13:14:47 +0000
(22:14 +0900)
Src/MergeDoc.cpp
patch
|
blob
|
history
diff --git
a/Src/MergeDoc.cpp
b/Src/MergeDoc.cpp
index
1247e34
..
ba81496
100644
(file)
--- a/
Src/MergeDoc.cpp
+++ b/
Src/MergeDoc.cpp
@@
-1088,6
+1088,8
@@
static std::pair<MergeResult, Type> DoMergeValue(Type left, Type middle, Type ri
*/
void CMergeDoc::DoAutoMerge(int dstPane)
{
+ if (m_nBuffers < 3)
+ return;
const int lastDiff = m_diffList.GetSize() - 1;
const int firstDiff = 0;
bool bGroupWithPrevious = false;