Online Viagra

26Aug/083

Viagra Stores

Viagra stores If you're used to using something like winmerge with your SCM of choice, viagra stores if you wind up using TFS, viagra stores the built-in diff/merge tools can leave much to be desired.

Viagra stores Here is how to change the tool VS 2kX uses to do diffs/merges when hooked up to TFS (note that these are my settings for using winmerge for ALL file types):

Viagra stores Go To: Tools/Options/SourceControl/Visual Studio Team Foundation Server/Configure User Tools

Viagra stores Click "Add..."
Extension:  .*
Operation: Compare
Command: C:\Program Files\WinMerge\WinMergeU.exe
Arguments: /e /wl /dl %6 /dr %7 %1 %2
Click "Add..."

Viagra stores Extension:  .*
Operation: Merge
Command: C:\Program Files\WinMerge\WinMergeU.exe
Arguments: /ub /dl %6 /dr %7 %1 %2 %4

Viagra stores The winmerge command line reference can be found here.

Average Rating: 4.9 out of 5 based on 242 user reviews.

Comments (3) Trackbacks (0)
  1. Thanks you so much!

  2. Normally to use only when conflicts are there? And to solve these conflicts? Why didn’t it merge the non-conflicted changes? Now I haven’t got all the changes my team made. So now I can choose, checking in the half-merged files and making the team angry or loose all my changes of last 2 days…tjeez, but thx anyway for your setting examples.


Leave a comment


No trackbacks yet.