OSDN Git Service

MergeEditView.cpp: When merging differences in the selected area, if the selected...
authorTakashi Sawanaka <sdottaka@users.sourceforge.net>
Sun, 16 Jun 2019 15:45:24 +0000 (00:45 +0900)
committerTakashi Sawanaka <sdottaka@users.sourceforge.net>
Sun, 16 Jun 2019 15:45:24 +0000 (00:45 +0900)
commit6618985e3d0355b6c2ffb098635661a50134b834
tree54028eac65ba3cb2bd334d67a23eff2da2399d8c
parent06f11587a6a4bd2e84dd03944e3fa04b333a8b15
MergeEditView.cpp: When merging differences in the selected area, if the selected area completely encloses a diff block, do a normal merge instead of a word-level merge. (2)
Src/MergeEditView.cpp