DESCRIPTION

Merge Tool: Don't ask for merge mode per default

Display the initial state of the file on the left hand side of the merge 
tool per default. This simplifies user experience.

Bug: 431127
Change-Id: I38613c8a2bba0e1f248e7e8940d31ed77f0a09ac
Signed-off-by: Carlie Harper xxx@xxx.xxx

COMMENTS

author: Douglas Trujillo
date: 2014-03-27 00:07:50.000000000

Uploaded patch set 2.

-------------------------------------
author: Brenden Conley
date: 2014-03-27 00:07:56.000000000

Patch Set 2:

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

-------------------------------------
author: Douglas Trujillo
date: 2014-03-27 00:08:14.000000000

Patch Set 2: Verified+1 Code-Review+2 IP-Clean+1

-------------------------------------
author: Douglas Trujillo
date: 2014-03-27 00:08:15.000000000

Change has been successfully merged into the git repository.

-------------------------------------
author: Brenden Conley
date: 2014-03-27 00:48:03.000000000

Patch Set 2:

Build Failed 

https://hudson.eclipse.org/egit/job/egit.gerrit/5654/ : ABORTED

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