Fix the problem that the comparison result is not displayed correctly when renaming a file (directory) that exists on only one side to a name where the directory (file) with the same name exists. (#1246)

- Change to judge that a directory or file exists only if the type (directory or file) of renamed item matches the original diffItem type in the diffItem update process.

Author: tjmprm77

Src/DirActions.h

@@ -559,7 +559,15 @@ bool DoItemRename(InputIterator& it, const CDiffContext& ctxt, const String& szN
 	for (int index = 0; index < nDirs; index++)
 	{
 		di.diffFileInfo[index].filename = szNewItemName;
-		if (bRename[index] || paths::DoesPathExist(GetItemFileName(ctxt, di, index)))
+		bool bSetSideFlag = bRename[index];
+		if (!bSetSideFlag)
+		{
+			paths::PATH_EXISTENCE pathExist = paths::DoesPathExist(GetItemFileName(ctxt, di, index));
+			bool bIsDirectory = di.diffcode.isDirectory();
+			if (((pathExist == paths::IS_EXISTING_DIR) && bIsDirectory) || ((pathExist == paths::IS_EXISTING_FILE) && !bIsDirectory))
+				bSetSideFlag = true;
+		}
+		if (bSetSideFlag)
 			di.diffcode.setSideFlag(index);
 	}
 	return true;