| commit | 36f67adbe1c4eaddc67c9ff9fa3d2a80fabb8029 | |
| author | Sven Strickroth <email@cs-ware.de> | |
| Tue, 29 Dec 2015 16:26:42 +0000 (29 17:26 +0100) | ||
| committer | Sven Strickroth <email@cs-ware.de> | |
| Wed, 30 Dec 2015 18:16:12 +0000 (30 19:16 +0100) | ||
| tree | c21c8f039c29c13f7b1a19e4d6fef0cc8b7a94e9 | treesnapshot (tar.gz zip) |
| parent | 18c101f8507eea8f00ae285bea114e13e2314226 | commitdiff |
Fixed issue #2676: Swapped Theirs and Mine in Edit conflicts outside of rebase dialog on rebasing
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Signed-off-by: Sven Strickroth <email@cs-ware.de>