MergeEditView.cpp: Fix "Copy to Left and Advance" not work in 3-way file compare...

diff --git a/Src/MergeEditView.cpp b/Src/MergeEditView.cpp
index 8ce3370..0ddaf3b 100644 (file)
--- a/Src/MergeEditView.cpp
+++ b/Src/MergeEditView.cpp
@@ -2746,6 +2746,8 @@ void CMergeEditView::OnUpdateConvertEolTo(CCmdUI* pCmdUI)
 void CMergeEditView::OnL2RNext()
 {
        OnL2r();
+       if (IsCursorInDiff()) // for 3-way file compare
+               OnNextdiff();
        OnNextdiff();
 }
 
@@ -2763,6 +2765,8 @@ void CMergeEditView::OnUpdateL2RNext(CCmdUI* pCmdUI)
 void CMergeEditView::OnR2LNext()
 {
        OnR2l();
+       if (IsCursorInDiff()) // for 3-way file compare
+               OnNextdiff();
        OnNextdiff();
 }