_posts/2007/2007-01-03-using-winmerge-as-merge-tool-in-visual.html

---
layout: post
title: Using winmerge as a merge tool in Visual Studio Team Suite
date: '2007-01-03T14:31:00.001Z'
modified_time: '2007-01-03T14:31:11.995Z'
blogger_id: tag:blogger.com,1999:blog-4015568221071268916.post-5958918803453059713
comments: true
blogger_orig_url: http://serialseb.blogspot.com/2007/01/using-winmerge-as-merge-tool-in-visual.html
---

<p>Found in msdn, to change the diff/merge tool used on conflicts with TFS:</p> <p>Go to Tools &gt; Options &gt; Source Control &gt; Visual Studio Team Foundation Server &gt; Configure User Tools...</p> <p>Add a Compare pointing to winmergeU.exe and using:</p> <blockquote> <p><em>/e /x /s /wl /dl %6 /dr %7 %1 %2 </em></p></blockquote> <p>as a command-line argument.</p> <p>Repeat the operation for merge, this time using:</p> <blockquote> <p>/e /s /x /ub /dl %6 /dr %7 %1 %2 %4</p></blockquote> <p>Enjoy!</p>