Do not add empty lines at the end
commitf74ea938917ab53f065a6a36644bf60f8e7ccac8
authorSven Strickroth <email@cs-ware.de>
Fri, 4 Jan 2013 20:47:40 +0000 (4 21:47 +0100)
committerSven Strickroth <email@cs-ware.de>
Fri, 4 Jan 2013 20:47:40 +0000 (4 21:47 +0100)
tree6e364baa51d0a318496a328ae70753828c6b6c6b
parent18b656fc9a83aa8dc0d8f95ce94f18d43a57cb60
Do not add empty lines at the end

When taking over changed blocks, don't adjust the line ending if it's the last line and the source block has no ending at the last line.

Based on TortoiseSVN revision 23785.

Signed-off-by: Sven Strickroth <email@cs-ware.de>
src/TortoiseMerge/BottomView.cpp
src/TortoiseMerge/RightView.cpp