* stable-4.9: ResolveMerger: Fix encoding with string; use bytes Change-Id: Ibd8f2a041b0de6e008a1ea84b92823f8cbc6e3d2 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>tags/v4.11.1.201807311124-r
@@ -449,7 +449,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()); |