Edwin Kempin d540a257ed Add user preference for auto-selecting a base for merges ... For reviewing merge commits most users expect to the see the full diff that is integrated by accepting the merge commit. This diff is available if the user selects 'Parent 1' from the 'Diff against' drop-down list, however this is a new feature and most users don't know about. Also it is inconvenient to manually select the first parent for every merge. To make this easier add a user preferences for automatically selecting a base for merges. Let the default for this new preference be 'First Parent', as this is what most users expect. Change-Id: I633291f78fee7f9ce1feb73deb81f9312363b347 Signed-off-by: Edwin Kempin <ekempin@google.com>		2016-09-09 08:38:56 +02:00
..
src	Add user preference for auto-selecting a base for merges	2016-09-09 08:38:56 +02:00
BUCK	Buck: Remove jgit cell	2016-04-20 22:02:49 +02:00