Configure Visual Studio

Other

Tools -> Options -> Text Editor -> All Languages -> Navigation bar -> [unchecked]
Tools -> Options -> Debugging -> General -> Enable Just My Code -> [unchecked]
Tools -> Options -> Debugging -> General -> Enable .NET Framework source stepping -> [unchecked]
Tools -> Options -> Projects and Solutions -> Build and Run -> MSBuild project build output verbosity -> [Normal]

HKEY_CURRENT_USER\Software\Microsoft\VisualStudio\11.0\General\SuppressUppercaseConversion
REG_DWORD value: 1

Diff/Merge Tools

  • Poate fi setat .* ca extensie a fisierelor, setand ca default aplicatia de diff. Presupun ca putem specifica si alte tipuri de wildcard-uri (*.asp*)
  • Explicatie parametri:
    • %1 = Original file (in diff, the pre-changes file, in merge, the "server" or "theirs" file, the file that is the base file after "their" changes were applied)
    • %2 = Modified file (in diff, the post-changes file, in merge the "yours" file - the base file with "your" changes applied)
    • %3 = Base file (in the 3-way merge operation, the file which both "theirs" and "yours" are derived from - the common ancestor. This doesn't mean it's the version the changes were based from, since this may be a cherry-pick merge)
    • %4 = Merged file (The output file for the merge operation - the filename that the merge tool should write to)
    • %5 = Diff options (any additional command-line options you want to pass to your diff tool - this comes into play only when using "tf diff /options" from the command-line)
    • %6 = Original file label (The label for the %1 file)
    • %7 = Modified file label (The label for the %2 file)
    • %8 = Base file label (The label for the %3 file)
    • %9 = Merged file label (The label for the %4 file)

Compare tools

Product Arguments
TFS default %1 %2 %6 %7 %5 /ignorespace
WinDiff %1 %2
DiffDoc (for Word files) /M%1 /S%2
WinMerge /ub /dl %6 /dr %7 %1 %2
Beyond Compare %1 %2 /title1=%6 /title2=%7
KDiff3 %1 --fname %6 %2 --fname %7
Araxis /wait /2 /title1:%6 /title2:%7 %1 %2
Compare It! %1 /=%6 %2 /=%7
SourceGear DiffMerge /title1=%6 /title2=%7 %1 %2
P4Merge -nl %6 -nr %7 %1 %2

Merge tools

Product Arguments
TFS default /merge %1 %2 %3 %4 %6 %7
KDiff3 %3 --fname %8 %2 --fname %7 %1 --fname %6 -o %4
Visual SourceSafe /merge %1 %2 %3 %4 %6 %7
Araxis /wait /swap /a3 /3 /title1:%6 /title2:%7 /title3:%8 %1 %2 %3 %4
Beyond Compare (2-way merge) %1 %2 /savetarget=%4 /title1=%6 /title2=%7
WinMerge (2-way merge) /ub /dl %6 /dr %7 %1 %2 %4
Guiffy -s -h1%6 -h2%7 -hm%9 %1 %2 %3 %4
Ellie Computing --mode=merge3 %3 %1 %2 --to=%4 --title0=%8 --title1=%6 --title2=%7 --to-title=%9
SourceGear DiffMerge /title1=%6 /title2=%8 /title3=%7 /result=%4 %1 %3 %2

P4Merge

http://www.richard-banks.org/2009/09/using-p4merge-with-visual-studio-2008.html
http://stackoverflow.com/questions/4034462/how-to-set-file-labels-in-p4merge

Surse

Unless otherwise stated, the content of this page is licensed under Creative Commons Attribution-ShareAlike 3.0 License