feature: is it possible to add some key mappings to choose ours/theirs for conflicts resolving?

[brookhong]

For example, in the middle buffer, we can use some shortcuts like co/ct to choose ours/theirs to fix the conflict without manual edit.

[dakennguyen]

you can use d2o to choose "ours" and d3o to choose "theirs" or :diffget //2 and :diffget //3 respectively

[brookhong]

Thanks @dakennguyen. Just tried these 2 combinations, it works but not perfectly, it always left something behind, such as the line below

>>>>>>>> Stashed changes

[dakennguyen]

have u tried perform d2o/d3o one more time on that line? I'm not sure if it's a but or not, but at least that what's I always do

[brookhong]

Yes, it works with one more d2o/d3o. But it should not work like that, I assume it should pick ours/theirs and remove all those extra lines.