| commit | e4bc9a011379b8d302408394a84e253ee3d384d4 | |
| author | Sven Strickroth <email@cs-ware.de> | |
| Sun, 7 Mar 2021 12:12:06 +0000 (7 13:12 +0100) | ||
| committer | Sven Strickroth <email@cs-ware.de> | |
| Sun, 7 Mar 2021 12:12:06 +0000 (7 13:12 +0100) | ||
| tree | 74ad9c8e62c0ab8348afa27903a77b03306300fc | treesnapshot (tar.gz zip) |
| parent | 58aaeecf757557dcf270f14223d7667cd5f640f9 | commitdiff |
Fixed issue #3700: Resolve the conflicts did not show the merge_head with correct branch name
The branch detection heuristic can now be disabled using the advanced setting "ConflictDontGuessBranchNames".
Signed-off-by: Sven Strickroth <email@cs-ware.de>
The branch detection heuristic can now be disabled using the advanced setting "ConflictDontGuessBranchNames".
Signed-off-by: Sven Strickroth <email@cs-ware.de>