From cb3d89b8b1276d3b4919c39466b81602091a415f Mon Sep 17 00:00:00 2001
From: "Joel W. Reed" <joelwreed@gmail.com>
Date: Wed, 5 Dec 2007 22:45:05 -0500
Subject: [PATCH] handle.local.paths

---
 tools/opentf/MergesCommand.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/opentf/MergesCommand.cs b/tools/opentf/MergesCommand.cs
index 51734fd..9a6bc08 100644
--- a/tools/opentf/MergesCommand.cs
+++ b/tools/opentf/MergesCommand.cs
@@ -31,6 +31,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Text;
 using Microsoft.TeamFoundation.Client;
+using Microsoft.TeamFoundation.VersionControl.Common;
 using Microsoft.TeamFoundation.VersionControl.Client;
 using Mono.GetOptions;
 using OpenTF.Common;
@@ -99,6 +100,9 @@ class MergesCommand : Command
 				break;
 			}
 
+		if (!VersionControlPath.IsServerItem(targetPath)) 
+			targetPath = Path.GetFullPath(targetPath);
+
 		RecursionType rtype = OptionRecursive ? RecursionType.Full : RecursionType.None;
 		bool setting = Settings.Current.GetAsBool("Merges.Recursive");
 		if (setting) rtype = RecursionType.Full;
-- 
2.11.4.GIT