core: keep history of merge.cpp
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 23 Feb 2019 15:41:39 +0000 (15:41 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 23 Feb 2019 15:41:39 +0000 (15:41 +0000)

Trivial merge