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: Douglas Trujillo
date: 2013-09-26 12:03:43.000000000

Uploaded patch set 3.

-------------------------------------
author: Brenden Conley
date: 2013-09-26 12:03:48.000000000

Patch Set 3:

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

-------------------------------------
author: Brenden Conley
date: 2013-09-26 12:19:28.000000000

Patch Set 3: Code-Review-1

Build Unstable 

https://hudson.eclipse.org/egit/job/egit-stable.gerrit/215/ : UNSTABLE

-------------------------------------
author: Danika Greer
date: 2013-09-26 19:16:17.000000000

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

-------------------------------------
author: Danika Greer
date: 2013-09-26 19:16:19.000000000

Change has been successfully merged into the git repository.

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