| commit | 3d478a989df433699f1bb64c80781718af92bec4 | |
| author | Frank Li <lznuaa@gmail.com> | |
| Fri, 28 May 2010 14:00:07 +0000 (28 22:00 +0800) | ||
| committer | Frank Li <lznuaa@gmail.com> | |
| Fri, 28 May 2010 14:00:07 +0000 (28 22:00 +0800) | ||
| tree | 85c6b65b38c3a35494f06758b510f02f402f67dc | treesnapshot (tar.gz zip) |
| parent | e3bd21854a95b5f2aab329ebc860e4538e39c130 | commitdiff |
Fixed issue #405: Merge commit message when there is a conflict
Signed-off-by: Frank Li <lznuaa@gmail.com>
Signed-off-by: Frank Li <lznuaa@gmail.com>
| src/TortoiseProc/CommitDlg.cpp | diffblobblamehistory |