| commit | 61f6d1c7455912c5d742ac7c452e73c8f8b614bb | |
| author | Sven Strickroth <email@cs-ware.de> | |
| Wed, 19 Nov 2014 14:31:18 +0000 (19 15:31 +0100) | ||
| committer | Sven Strickroth <email@cs-ware.de> | |
| Wed, 19 Nov 2014 14:33:43 +0000 (19 15:33 +0100) | ||
| tree | 3616153b875c16f36c2b923489796b84709a310b | treesnapshot (tar.gz zip) |
| parent | 6e751be2ff206bdc3b75d1f7387948d200ba0f00 | commitdiff |
Fixed issue #2348: Conflicts during rebase appends "conflicts" to commit message
Regression of commit 1f85a7bf27b8d19274f2e03bd9b8c2a5d165af92.
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Regression of commit 1f85a7bf27b8d19274f2e03bd9b8c2a5d165af92.
Signed-off-by: Sven Strickroth <email@cs-ware.de>
| src/Changelog.txt | diffblobblamehistory | |
| src/TortoiseProc/RebaseDlg.cpp | diffblobblamehistory |