Support Git 2.9 Merge unrelated history
commitdad983880587da08790c904448862da1da6df8e6
authorSup Yut Sum <ch3cooli@gmail.com>
Thu, 13 Oct 2016 16:07:25 +0000 (14 00:07 +0800)
committerSven Strickroth <email@cs-ware.de>
Sat, 15 Oct 2016 22:19:49 +0000 (16 00:19 +0200)
tree8fbb780031f19f6f8cd646f416a3d6f8b179f46d
parenta9a06d3444300b86560d79a944d0152773033b09
Support Git 2.9 Merge unrelated history

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Languages/Tortoise.pot
src/Resources/TortoiseProcENG.rc
src/TortoiseProc/AppUtils.cpp
src/TortoiseProc/resource.h