From 2439c11bdc9d64d240191ee689971fc2f98c6102 Mon Sep 17 00:00:00 2001 From: sdottaka Date: Tue, 28 Jan 2014 21:45:42 +0900 Subject: [PATCH] fix for failure to create a backup file when specifying a relative path as command line argument --HG-- branch : stable --- Src/Merge.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Src/Merge.cpp b/Src/Merge.cpp index 6596cb0b0..95408348f 100644 --- a/Src/Merge.cpp +++ b/Src/Merge.cpp @@ -930,7 +930,7 @@ BOOL CMergeApp::CreateBackup(BOOL bFolder, const String& pszPath) String filename; String ext; - paths_SplitFilename(pszPath, &path, &filename, &ext); + paths_SplitFilename(paths_GetLongPath(pszPath), &path, &filename, &ext); // Determine backup folder if (GetOptionsMgr()->GetInt(OPT_BACKUP_LOCATION) == -- 2.11.0