| commit | 0ecfc8dc878a4613801c5d263a983534f5799efe | |
| author | Sven Strickroth <email@cs-ware.de> | |
| Mon, 10 Aug 2015 08:53:53 +0000 (10 10:53 +0200) | ||
| committer | Sven Strickroth <email@cs-ware.de> | |
| Mon, 10 Aug 2015 11:10:58 +0000 (10 13:10 +0200) | ||
| tree | 872f84e49a691b7fb2e8f300722aa84e0c39e342 | treesnapshot (tar.gz zip) |
| parent | 87967cc8d97c89b8a82fa453735991a040a9c865 | commitdiff |
No need to check for conflicts of we know there aren't any
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Signed-off-by: Sven Strickroth <email@cs-ware.de>
| src/Git/GitIndex.cpp | diffblobblamehistory | |
| src/Git/GitStatus.cpp | diffblobblamehistory | |
| src/Git/gitindex.h | diffblobblamehistory | |
| test/UnitTests/GitIndexTest.cpp | diffblobblamehistory |