| commit | bcfdeab87663e98bc1d3cab8611427cc9927fe60 | |
| author | Sven Strickroth <email@cs-ware.de> | |
| Fri, 21 Nov 2014 17:25:09 +0000 (21 18:25 +0100) | ||
| committer | Sven Strickroth <email@cs-ware.de> | |
| Fri, 21 Nov 2014 17:25:09 +0000 (21 18:25 +0100) | ||
| tree | 4c9c44c2d468162590b1c92427d4edef35b14e22 | treesnapshot (tar.gz zip) |
| parent | 635ce12788639d5a0224b2afc56c93a2544a8ae8 | commitdiff |
TGitCache: Correctly show file status for delete-modify conflict
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Signed-off-by: Sven Strickroth <email@cs-ware.de>
| src/Git/GitStatus.cpp | diffblobblamehistory |