Just for completeness, I was running Win10 圆4, VS 2015 update 2, and below is a listing of my config (slightly censored) PS> git config ‑‑global ‑‑list mklink H:\.gitconfig C:\users\jsmith\.gitconfig gitconfigs ‑ a) the windows default of C:\users\jsmith\.gitconfig and H:\.gitconfig (my H: drive is a mapped drive to what IT call my "home folder").Īfter I created a symlink using something like the below (you'll need to edit it), Visual Studio brought up WinMerge. In addition to what said (and I added a guitool entry just for good measure), I discovered that the domain policy I was in created two "home" directories and consequently two. gitconfig (under C:\users\username), and it is working: Ĭmd = winmergeu.exe ‑e ‑ub ‑x ‑wl ‑u ‑maximise ‑dl "base" ‑dr "mine" \"$LOCAL\" \"$REMOTE\"
I have VS2015 SP1 and WinMerge on my path, nothing set in my solution.
It was also the last version to ship with an ANSI version of WinMerge. WinMerge version 2.12.4 was the last version to ship with Microsoft Visual C++ 2005 runtimes that support Windows 95/98/ME/NT. WinMerge version 2.14.0 was the last version to ship with Microsoft Visual C++ 2008 runtimes that support Windows 2000. Other Versions WinMerge 2.14.0 for Windows 2000
Admin rights for the installer (except for Per-user installer).64-bit installer: Microsoft Windows 7 or newer.32-bit installer: Microsoft Windows XP SP3 or newer.
0 kommentar(er)
