Archive for April, 2011

Skype Built-in Features that I didn’t think they exists

The “hidden” features are:

  1. Turn off pencil animation while typing (#3)
  2. Paste as plain text/copied-message (#4 marked in screen-shot)

image    2011-04-19 23h49_19

2011-04-19 23h48_42

Hope this is helpful to you!

Nam.

Cool External Diff/Merge Tool used for Visual Studio 2010 and TortoiseSVN

Among the diff/merge tools I’ve used, I am impressed the most with SourceGear DiffMerge tool. The SO community also recommended it.

I’ve been working with .Net & open-source technologies – the source-code management client-tool I used is Visual Studio and TortoiseSVN. Here’s how we configure these two tools to work with DiffMerge.

DiffMerge used in Visual Studio 2010

Open Visual Studio options by Tools-Options and open the `Source Control – Visual Studio Team Foundation Server` section.
Then, use the below DiffMerge execution syntax in textbox 3rd in the screenshot. Note that <DiffMerge.exe> stands for path to DiffMerge execution file location.

[compare]
<DiffMerge.exe> /title1=%6 /title2=%7 %1 %2

[merge]

<DiffMerge.exe> /title1=%6 /title2=%8 /title3=%7 /result=%4 %1 %3 %2

2011-04-19 13h18_29

2011-04-19 13h16_20

DiffMerge used in TortoiseSVN

Open Tortoise setting and open the `External Programs` section.
Then, use the below DiffMerge execution syntax in textbox 3rd in the screenshot.

[compare]
<DiffMerge.exe> /title1=%yname /title2=%bname %mine %base

[merge]

<DiffMerge.exe> /title1=%yname /title2=%bname /title3=tname /result=%merged %mine %base %theirs

image

Hope this is helpful to you!

Nam.