| commit | bc28507fdf20b8fde0188fc058ca2317cff2b860 | |
| author | Sup Yut Sum <ch3cooli@gmail.com> | |
| Mon, 10 Nov 2014 15:57:35 +0000 (10 23:57 +0800) | ||
| committer | Sup Yut Sum <ch3cooli@gmail.com> | |
| Wed, 12 Nov 2014 17:43:06 +0000 (13 01:43 +0800) | ||
| tree | f1f29b95407bac59f6c1b6955885d587132ca9f7 | treesnapshot (tar.gz zip) |
| parent | 2105fa5de177776e78e5317381d013cbb1ac63ea | commitdiff |
TortoiseGitMerge: On saving, ask user how to save marked blocks
Based on TortoiseSVN revision 26035
Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Based on TortoiseSVN revision 26035
Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>