* stable-4.8: ResolveMerger: Fix encoding with string; use bytes Change-Id: Id6a85804695d5dcb32f26ed1d861b7c93577c5e4 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>tags/v4.9.3.201807311005-r
@@ -434,7 +434,7 @@ public class ResolveMerger extends ThreeWayMerger { | |||
* @return the entry which was added to the index | |||
*/ | |||
private DirCacheEntry keep(DirCacheEntry e) { | |||
DirCacheEntry newEntry = new DirCacheEntry(e.getPathString(), | |||
DirCacheEntry newEntry = new DirCacheEntry(e.getRawPath(), | |||
e.getStage()); | |||
newEntry.setFileMode(e.getFileMode()); | |||
newEntry.setObjectId(e.getObjectId()); |