| commit | 00bd6451fe0f89aecec62cdcc9466473c1f25535 | |
| author | Sven Strickroth <email@cs-ware.de> | |
| Wed, 22 Jun 2016 13:31:54 +0000 (22 15:31 +0200) | ||
| committer | Sven Strickroth <email@cs-ware.de> | |
| Wed, 22 Jun 2016 13:31:54 +0000 (22 15:31 +0200) | ||
| tree | 6e688d8a52cdd1efca8a86515e92f5556166d63b | treesnapshot (tar.gz zip) |
| parent | 66611e563a7c67383d13863730bd09a570a80420 | commitdiff |
Fixed issue #2785: Rebase/Cherry-pick with conflict in renamed file fails
Was already fixed in with commit 75900a78ec916069093d60dc9c8d9f95f2a31fcf.
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Was already fixed in with commit 75900a78ec916069093d60dc9c8d9f95f2a31fcf.
Signed-off-by: Sven Strickroth <email@cs-ware.de>
| src/Changelog.txt | diffblobblamehistory | |
| src/TortoiseProc/RebaseDlg.cpp | diffblobblamehistory |