Merge pull request #2676 from Robert-N7/master

Hotfix in restore discard history of files with same name

Author: smashwilson

lib/models/discard-history.js

@@ -127,7 +127,7 @@ export default class DiscardHistory {
         await this.expandBlobToFile(path.join(tempFolderPath, `${filePath}-before-discard`), beforeSha);
       const commonBasePath = !afterSha ? null :
         await this.expandBlobToFile(path.join(tempFolderPath, `${filePath}-after-discard`), afterSha);
-      const resultPath = path.join(tempFolderPath, `~${path.basename(filePath)}-merge-result`);
+      const resultPath = path.join(dir, `~${path.basename(filePath)}-merge-result`);
       return {filePath, commonBasePath, theirsPath, resultPath, theirsSha: beforeSha, commonBaseSha: afterSha};
     });
     return await Promise.all(pathPromises);