![]() ![]() Basically, enter TortoiseGit Settings and there: To setup it as diff and merge tool in TortoiseGit (TortoiseSVN and others are similar I think), follow instructions from article Using P4Merge with TortoiseGit. Now you have this great, free tool in your system. Then install it, but from the installation components leave only "Visual Merge Tool (P4Merge)". To grab it, go to Perforce Downloads and download appropriate (32-bit or 64-bit) version of the P4V: Visual Client. It turns out that this tool is also free! It's actually the best tool of this kind I've ever seen on Windows, better than free TortoiseMerge, DiffMerge or KDiff3. It has its pros and cons, but the included diff/merge tool is definitely its good point. Perforce (or P4 for short) is a commercial version control system used in many companies instead of free CVS, SVN, Mercurial or Git. I keep it for reference, but it probably doesn't reflect my current knowledge and beliefs. Similarly, if you don't need to refresh the workspace after the launcher completes, you can disable that in the 'Refresh' tab.Warning! Some information on this page is older than 6 years now. For example, if you don't need to build the project before launching (as you wouldn't for difftool), you can turn that off in the 'Build' tab. There are sone other options in the external launchers that can be used to optimize the behavior a little. ![]() To share just add, commit and push as usual. The new launcher will now show up as an untracked file. For the value choose any directory you like in your project, or make a new one and use that. Do this in Preferences -> Run/Debug/String Substitution.ġ) Open "External Tools Configuration." from the External Tools toolbar itemģ) For the Location value use $ĥ) For the Arguments, provide the Git command-line argument(s), eg 'difftool' (without the quotes of course)Ħ) For the Name use whatever you like, eg Git difftoolħ) To share this launcher, click the 'Common' tab, then the 'Shared FIle' radio button. This will allow you to share the launcher by saving it as a part of the repository without making any assumptions about where each developer has command-line Git installed. ![]() Proceed with an external launcher you mean? That's pretty easy:Īs a preliminary I recommend defining a String Substitution variable called 'git_exec', where the value is the path you your Git executable. gitconfig for quite a few diff/merge tools, except emerge, kompare, vimdiff. Ma Thomas wrote on Tue, 17 April 2012 23:01 External option sounds great. Path = "c:/lang/tools/diff_merge/perforce/p4merge.exe"Ĭmd = "\"c:/lang/tools/diff_merge/windiff/windiff.exe\" \"$LOCAL\" \"$REMOTE\"" Path = "c:/lang/tools/diff_merge/KDiff3/kdiff3.exe" Path = "c:/lang/tools/diff_merge/ecmerge/ecmerge.exe" Path = "c:/lang/tools/diff_merge/bc3/bcomp.exe"Ĭmd = "\"c:/lang/tools/diff_merge/diffmerge/sgdm.exe\" \"$LOCAL\" \"$REMOTE\"" ![]()
0 Comments
Leave a Reply. |