Nathan Shively-Sanders c49ef36964 First half of fix
Still doesn't work correctly for multiple merges
2018-05-10 16:51:46 -07:00
..
2018-05-10 16:51:46 -07:00