This will show the original lines present in a given conflict block, which gives more context for resolving the conflict.master
parent
8e7fc10d7e
commit
4014f6bb25
Loading…
Reference in new issue