| commit | d22046b22d40ee733cbee175df2a6c9725287cba | |
| author | Sup Yut Sum <ch3cooli@gmail.com> | |
| Wed, 23 Jan 2013 00:09:55 +0000 (23 08:09 +0800) | ||
| committer | Sup Yut Sum <ch3cooli@gmail.com> | |
| Wed, 23 Jan 2013 00:09:55 +0000 (23 08:09 +0800) | ||
| tree | 9b8047cf7369179adbb7c90b192ceb8db70c9770 | treesnapshot (tar.gz zip) |
| parent | f58610cad0960a57b3ae9f8a2b4fdca7810b751f | commitdiff |
Could not show submodule conflicts in TortoiseMerge, now can show the BASE, LOCAL, REMOTE in a simple message box
Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
| src/TortoiseProc/AppUtils.cpp | diffblobblamehistory |