DESCRIPTION

Cherry-pick with conflicts must not change author ident

If cherry-pick stops with conflicts author ident must not be changed
when committing resolved conflicts.

Bug: 413043
Change-Id: I48b8355939022265b9041da018131a1fad1f2366
Signed-off-by: Douglas Trujillo xxx@xxx.xxx

COMMENTS

author: Brenden Conley
date: 2013-09-25 22:50:12.000000000

Patch Set 1:

Build Started https://hudson.eclipse.org/egit/job/egit-stable.gerrit/210/

-------------------------------------
author: Brenden Conley
date: 2013-09-25 22:53:29.000000000

Patch Set 1: Verified-1

Build Failed 

https://hudson.eclipse.org/egit/job/egit-stable.gerrit/210/ : FAILURE

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