| commit | e0bc6f24ac6713872d388a2b0cb4488c09825345 | |
| author | Sven Strickroth <email@cs-ware.de> | |
| Sun, 25 Mar 2012 16:42:15 +0000 (25 18:42 +0200) | ||
| committer | Sven Strickroth <email@cs-ware.de> | |
| Sun, 25 Mar 2012 16:42:15 +0000 (25 18:42 +0200) | ||
| tree | 083800336a64659440ecf2d4562b9f32230118b4 | treesnapshot (tar.gz zip) |
| parent | 84104e3171b41414e626dab1da5cb57d47eddf83 | commitdiff |
TortoiseMerge: correctly detect and allow to resolve "added file" exists on apply patch
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Signed-off-by: Sven Strickroth <email@cs-ware.de>
| src/TortoiseMerge/MainFrm.cpp | diffblobblamehistory | |
| src/TortoiseMerge/Patch.cpp | diffblobblamehistory | |
| src/TortoiseMerge/Patch.h | diffblobblamehistory |