Skip to content
Commit 7bd5e89f authored by Jörn Friedrich Dreyer's avatar Jörn Friedrich Dreyer
Browse files

simplify conflict template handling, fix reopen after ESC

parent 12ff268e
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment