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:
4910a45
)
MergeDoc.cpp: 'Copy All To Left/right' did not work correctly when the source pane...
author
Takashi Sawanaka
<sdottaka@users.sourceforge.net>
Sun, 10 Mar 2019 03:29:45 +0000
(12:29 +0900)
committer
Takashi Sawanaka
<sdottaka@users.sourceforge.net>
Sun, 10 Mar 2019 03:29:45 +0000
(12:29 +0900)
Src/MergeDoc.cpp
patch
|
blob
|
history
diff --git
a/Src/MergeDoc.cpp
b/Src/MergeDoc.cpp
index
b3bc4f2
..
377da57
100644
(file)
--- a/
Src/MergeDoc.cpp
+++ b/
Src/MergeDoc.cpp
@@
-1246,6
+1246,9
@@
bool CMergeDoc::WordListCopy(int srcPane, int dstPane, int nDiff, int firstWordD
if (worddiffs.empty())
return false;
+ if (cd.end[srcPane] < cd.begin[srcPane])
+ return ListCopy(srcPane, dstPane, nDiff, bGroupWithPrevious, bUpdateView);
+
if (firstWordDiff == -1)
firstWordDiff = 0;
if (lastWordDiff == -1)