Skip to main content
I saw how to do this on but the information was out of date.


  • Download and install diffmerge.

I used this link: DiffMerge.


  • Verify you can run it from the command line:





  • Run the following commands from the git command line


   
git config --global diff.tool diffmerge
git config --global difftool.diffmerge.cmd 'sgdm "$LOCAL" "$REMOTE"'
git config --global merge.tool diffmerge
git config --global mergetool.diffmerge.cmd 'sgdm --merge --result="$MERGED" "$LOCAL" "$(if test -f "$BASE"; then echo "$BASE"; else echo "$LOCAL"; fi)" "$REMOTE"'
git config --global mergetool.diffmerge.trustExitCode true


  • Now use the standard git commands for launching diffs and merges
   
git difftool filename.ext
git difftool branchname filename.ext
git mergetool


Note:  I had to perform these steps twice.  Once running the git command line under admin and once under user.  There are times I need to run as admin and it uses a different global config file location.

Comments

Post a Comment

Popular posts from this blog

Galaxy Outlaws Review

I just finished Galaxy Outlaws: The Complete Black Ocean Mobius Missions, 1-16.5 It was what I would classify as a good read.  It didn't compel me to read it.  There were a couple of times I found myself not being able to put the book down but I wasn't really compelled to get through quickly. You see I listen to most of my books when I run, drive, shop or doing house chores. I never found myself fighting the urge to run further, drive in circles, shop more often or do more house chores.  That is not to say it was a good read.  It just wasn't a compelling read. I didn't really like the magic vs. star drive thing for star travel. Now, with that said, it did grow on me and in the end, I tended to enjoy it more. The whole magic thing just felt like a get out of jail card through most of the series. The characters even talk about how Mort (wizard) bails them out of bad plans but I am saying it is more a get out of jail free card for the story.  Back yo...
Post a Comment
Read more

Android’s trust problem isn’t getting better - The Verge

Android’s trust problem isn’t getting better - The Verge : I disagree with much of this article. I have owned both brands and I prefer my Android devices. I don't have a trust problem with Android. It matters not which brand you use, this is a cat and mouse game that has been going on for centuries. In the end, I am not willing to trade my individual control for protection.
Post a Comment
Read more