Michael Seibt

As a workaround, you might try to switch to a different console style.  Maybe there has been reported a regarding issue on https://github.com/Maximus5/ConEmu.

👍 When rebasing, the term "incoming (ours)" is much clearer to me than just "remote (ours)". "remote/" and "local/" help to identify the regarding files in the merge tool. It...

What have you done on the prompt "Store key in cache? (y/n, Return cancels connection, i for more info)"? 1. entered 'y' or 'n' and pressed `Return` 2. closed the...

Do you get that prompt and can enter your input if you use ConEmu? 

I have seen similar artifacts, too, mostly after rebase operations. I had two suspects: the commit identified by you or #11205. > I can make a PR to revert to...

Try it with #11718 and #11719, please.

It works for me. Perhaps re-registering the shell extension helps (will ask for admin privileges): 

> It is hard to review though, it is hard to understand why changes are done, what is better, how this is an improvement. Yes, this was missing in the...

Which settings are affected?

> Revision links. Not reproducible. These settings _are_ applied on repo switch. > Plugins ... are not my specialty.