Fixed issue #1500: Support git merge --log option
commit150bab9cfce0e45a93040fff2c896caaaa445ab8
authorSup Yut Sum <ch3cooli@gmail.com>
Sun, 27 Jan 2013 04:54:18 +0000 (27 12:54 +0800)
committerSup Yut Sum <ch3cooli@gmail.com>
Sun, 27 Jan 2013 05:09:34 +0000 (27 13:09 +0800)
tree8d4d9a1f5e61ca2817f9dc77fb623ab67d431eb9
parent991a695c1407be101d5e97b88e4f9c87385c850f
Fixed issue #1500: Support git merge --log option

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
doc/images/en/Merge.png
doc/source/en/TortoiseGit/tsvn_dug/dug_merge.xml
src/Changelog.txt
src/Resources/TortoiseProcENG.rc
src/TortoiseProc/AppUtils.cpp
src/TortoiseProc/MergeDlg.cpp
src/TortoiseProc/MergeDlg.h
src/TortoiseProc/resource.h