I am using git 1.9.4 for windows ().
$ git difftool
$ git difftool - no promissory branch A branch B
/ code> Attempts to open all files at once (what I have to do), but vsdiffmerge can not handle it properly in any way
- Many empty examples of vsdiffmerge
- In the already opened frequency, the difference file will be converted into an inter alia with another file
How can I configure my difftool so that behavior is a frequency Vsdiffmerge, with many tabs of all diffs? [Diff "astextplain"] textconv = astextplain [rebase] autosquash = true [diff] tool = vsdiffmerge [difftool] expedited = true [difftool] vsdiffmerge
"] CMD = \" C: \\ Program Files (x86) \\ Microsoft Visual Studio 11 0 Common 7 \\ IDE \\ vsdiffmerge.exe \ "$ LOCAL \" \ "$ REMOTE \" // T keepbackup = False trustexistcode = true [merge] tool = vsdiffmerge [mergetool] prompt = true [mergetool "vsdiffmerge"] cmd = \ "c: \\ programmable files (x86) \\ Microsoft Visual Studio 11.0 \\ Common 7 \\ IDE \ "Disfirm.exe \" \ "$ remote \" \ "local $" \ "$ base \" \ "$ mr \ "// m keepbackup = false trust acycl code = true
Comments
Post a Comment