[BZ#763475] In 3 way merge, add option to merge left then right and another option to merge right then left
Submitted by dan..@..com
Link to original bug (#763475)
Description
Many times during a merge I find that I have to manually edit the file to include changes from both the left and the right side. It would be nice to have the option to right click on the section and select merge left then right or right then left.