| commit | 70fc0ba9157b1d26e487dbb50797f4d77fdb04b7 | |
| author | Sup Yut Sum <ch3cooli@gmail.com> | |
| Fri, 28 Mar 2014 15:08:10 +0000 (28 23:08 +0800) | ||
| committer | Sup Yut Sum <ch3cooli@gmail.com> | |
| Fri, 28 Mar 2014 15:08:10 +0000 (28 23:08 +0800) | ||
| tree | e045b2793cab5f5501581032bcf5cb0c42c5858b | treesnapshot (tar.gz zip) |
| parent | 254250f7051b5676d1cf954c47cd9744d35a7076 | commitdiff |
Fixed issue #2147: Resolve not dealing correctly with (modify/delete) conflicts
Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
| src/Changelog.txt | diffblobblamehistory | |
| src/Git/GitStatusListCtrl.cpp | diffblobblamehistory |