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:
748e29d
)
MergeDoc.cpp: 'Copy All To Left/right' did not work correctly when the source pane...
author
Takashi Sawanaka
<sdottaka@users.sourceforge.net>
Sun, 31 Mar 2019 22:54:13 +0000
(07:54 +0900)
committer
Takashi Sawanaka
<sdottaka@users.sourceforge.net>
Sun, 31 Mar 2019 22:54:13 +0000
(07:54 +0900)
Src/MergeDoc.cpp
patch
|
blob
|
history
diff --git
a/Src/MergeDoc.cpp
b/Src/MergeDoc.cpp
index
59f188c
..
7438cd5
100644
(file)
--- a/
Src/MergeDoc.cpp
+++ b/
Src/MergeDoc.cpp
@@
-866,7
+866,7
@@
void CMergeDoc::CopyMultipleList(int srcPane, int dstPane, int firstDiff, int la
}
// Group merge with previous (merge undo data to one action)
bGroupWithPrevious = true;
- if (i > firstDiff)
+ if (i > firstDiff
|| firstWordDiff <= 0
)
{
if (!ListCopy(srcPane, dstPane, -1, bGroupWithPrevious, false))
break; // sync failure