tree 976542c3bffa4e73499cccf83b41f94c150ee901
parent 002c7931e2265a54c3890348f9f6ee16d7f67765
author Paladox none <thomasmulhall410@yahoo.com> 1550106708 +0000
committer Paladox none <thomasmulhall410@yahoo.com> 1551776111 +0000

Fix support to use "Default Base For Merges" preference

* This implements the setting.

* This also uses it for picking rather to show Parent 1 or Auto Merge first.

Bug: Issue 8838
Change-Id: I6888b449acb285081db427119990120eb8875e6c