| commit | ae88693e388a606ee89ee888b36cf0f9f0d7566e | |
| author | Sup Yut Sum <ch3cooli@gmail.com> | |
| Wed, 11 Sep 2013 12:28:50 +0000 (11 20:28 +0800) | ||
| committer | Sup Yut Sum <ch3cooli@gmail.com> | |
| Wed, 11 Sep 2013 12:30:03 +0000 (11 20:30 +0800) | ||
| tree | 998a522e49eeda8bd817ecac07376d421b384c59 | treesnapshot (tar.gz zip) |
| parent | 512f07fd85994fbb8f3fd4e46762fedc42ec3cff | commitdiff |
| parent | 3bf640f724e52b7969125f3808c45ba73adce913 | commitdiff |
TortoiseGitIDiff: Conflict resolving for images
Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
| src/Changelog.txt | diff1 | diff2 | blobhistory |