Fixed issue #2148: Cherry pick with conflicts does not add "Cherry picked from..."
commit1f85a7bf27b8d19274f2e03bd9b8c2a5d165af92
authorSup Yut Sum <ch3cooli@gmail.com>
Mon, 31 Mar 2014 10:06:57 +0000 (31 18:06 +0800)
committerSup Yut Sum <ch3cooli@gmail.com>
Mon, 31 Mar 2014 10:06:57 +0000 (31 18:06 +0800)
tree2a8b8d9363dc5944a836900ac3312556cab43296
parentdd16fe1406bb682d27b24f57e9b3e6008b335285
Fixed issue #2148: Cherry pick with conflicts does not add "Cherry picked from..."

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
src/Changelog.txt
src/TortoiseProc/RebaseDlg.cpp