Why can't I use TortoiseMerge as my git merge tool on Windows? -

-

i'm trying perform first git merge ever (exciting!), can't git gui (0.13.gitgui git 1.7.4.msysgit.0) recognize tortoisemerge (1.6.11.20210 x64) on windows 7. based on an answer similar question, i've made following configuration changes:

$ git config --global merge.tool tortoisemerge $ git config --global mergetool.tortoisemerge.cmd 'tortoisemerge.exe -base:"$base" -mine:"$local" -theirs:"$remote" -merged:"$merged"' $ git config --global --list ...snip... merge.tool=tortoisemerge mergetool.tortoisemerge.cmd=tortoisemerge.exe -base:"$base" -mine:"$local" -theirs:"$remote" -merged:"$merged" $

unfortunately, when start git gui , attempt "run merge tool", receive error unsupported merge tool 'tortoisemerge'.

can tell me i've done wrong? here's relevant sections of ~/.gitconfig:

[merge]         tool = tortoisemerge [mergetool "tortoisemerge"]         cmd = tortoisemerge.exe -base:\"$base\" -mine:\"$local\" -theirs:\"$remote\" -merged:\"$merged\"

update

tortoisemerge works fine above config when running git mergetool command line. seems git gui has problems it. :-/

update:

the original answer obsolete.

if have latest git one-time git config merge.tool tortoisemerge

important: not add .exe extension command.

=== original answer (now outdated) ===

i don't have tortoisemerge installed can't test this, i'm pretty sure problem git gui uses file called c:\program files (x86)\git\share\git-gui\lib\mergetool.tcl define each merge tool works with, , shows "unsupported merge tool" error merge tools defined in .gitconfig don't match 1 of ones defined in mergetool.tcl.

so, make work, should able add mergetool.tcl:

tortoisemerge {     set cmdline [list tortoisemerge.exe -base:"$base" -mine:"$local" -theirs:"$remote" -merged:"$merged"] }

put new tortoisemerge entry above other code:

default {         error_popup [mc "unsupported merge tool '%s'" $tool]         return }

Comments

Post a Comment

Popular posts from this blog

c# - How to set Z index when using WPF DrawingContext? -

-
how set z-index drawing object when using drawingcontext.drawxxx() methods? the object drawn last have higher z index. can't change index of drawn objects. way draw in order. if using wpf (as placed tag), can use, example, canvas control. create shapes need like polyline obj = new polyline(); //... // ... set properties of obj and add them canvas uielementcollection: yourcanvasname.children.add(obj); //or yourcanvasname.children.insert(i, obj); first items of collection have higher z index. advantages in way: no need redraw on window changes, can anytime move objects , change order.
Read more

razor - Is this a bug in WebMatrix PageData? -

-
i think may have found bug in webmatrix's pagedata, not sure. concerns how pass data partial page calling page. in webmatrix documentation (tutorials, e.g. " 3 - creating consistent look ", , example code), pagedata recommended mechanism pass data between pages (e.g. content page layout page, or partial page). however have found not work other way, pass data partial page calling page. modifying or adding entries in pagedata in partial page, not seem calling page. cutting right down simplest possible example, in test page may have this: @{ pagedata["test"] = "initial entry"; } <p>before calling partial page, test value @pagedata["test"]</p> @renderpage("_testpartial.cshtml") <p>after returning calling page, test value @pagedata["test"]</p> and in _testpartial.cshtml page might have this: @{ pagedata["test"] = "modified entry"; } <p>in partial page...
Read more

visual c++ - Using relative values in array sorting ( asm ) -

-
i need sort through array , sort each individual row in array in ascending order. doesn't seem going (surprise!) keep getting hit 2 errors: a2101: cannot add 2 relocatable labels , a2026: constant expected here's sort, makes sense me, think i'm still trying implement high-lvl language techniqes assembly. there way around not being able use relative values? (the array 7 rows 9 columns, btw). mov cx, 7; cx = number of rows outer: ; outer loop walk through rows push cx mov cx, 9 mov row, cx ;rows middle: ; middle-loop walk through columns push cx sub cx, 1 ;cx = cx-1 mov column, cx ;columns inner: ;inner loop - compare , exchange column values cmp marray[row*9 + column], marray[row*9 + column+1] xchg marray[row*9 + column+1], marray[row*9 + column] ; compare , exchange values marray table inc column loop inner pop cx loop mid...
Read more