When taking over changed blocks, make sure previous (non empty) line have an EOL set
commitd2ea776a534899737b8f4c541d026deb5c95edf0
authorSven Strickroth <email@cs-ware.de>
Sat, 5 Jan 2013 10:43:23 +0000 (5 11:43 +0100)
committerSven Strickroth <email@cs-ware.de>
Sat, 5 Jan 2013 10:43:23 +0000 (5 11:43 +0100)
tree70c2d3830d2a0ec101e032e11bb7fa9ca9f64dd9
parentf74ea938917ab53f065a6a36644bf60f8e7ccac8
When taking over changed blocks, make sure previous (non empty) line have an EOL set

Based on TortoiseSVN revision 23786.

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