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: Carlie Harper
date: 2014-03-25 15:19:45.000000000

Uploaded patch set 1.

-------------------------------------
author: Brenden Conley
date: 2014-03-25 15:19:51.000000000

Patch Set 1:

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

-------------------------------------
author: Brenden Conley
date: 2014-03-25 15:43:22.000000000

Patch Set 1: Code-Review-1

Build Unstable 

https://hudson.eclipse.org/egit/job/egit.gerrit/5641/ : UNSTABLE

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