DESCRIPTION

Place preference controls on single row

The merge tool and timeout preference value control were
previously on a row below the label controls.

This change places them on the same row to be consistent
with other groups displayed in the preference page.

Change-Id: I0060e8fe9dcb302784fa00e524630f2d80a606b3
Signed-off-by: Jaidyn Nichols xxx@xxx.xxx

COMMENTS

author: Brenden Conley
date: 2011-11-07 18:58:05.000000000

Patch Set 1:

Build Started https://hudson.eclipse.org/sandbox/job/egit.gerrit/1915/ 

-------------------------------------
author: Brenden Conley
date: 2011-11-07 19:13:42.000000000

Patch Set 1: I would prefer that you didn't submit this

Build Unstable 
 
https://hudson.eclipse.org/sandbox/job/egit.gerrit/1915/ : UNSTABLE

-------------------------------------
