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

Mindhunter By John E Douglas

I read and listen to a lot of books.   I am going to try my hand at some short reviews.  I am going to do this to help me bring order my takeaways, thoughts, and feelings and I hope sharing this helps and interests others.  I like fiction and non-fiction.  I go after science fiction and fantasy in fiction more often than not but like many other genres.  The non-fiction books include but are not limited to self-help, biographies, and history.    Now, these reviews are not intended to be comprehensive takeaways about the learnings, plots, and characters but more what stood out to me.  What I took away from it.  How it made me feel.  If this is something interests you read on: Mindhunter: Inside the FBI's Elite Serial Crime Unit  By John E. Douglas I don't recall where or why I added this book to my library so I wasn't sure what it was about when I started it.   In one sentence: It is the story and career of John E. Douglas and how the FBI's Elite Serial
Post a Comment
Read more

Microsoft patent division taking cash from at least 5 Android vendors

Microsoft patent division taking cash from at least 5 Android vendors I love some of Microsoft products. However, the patent system is broken. It becomes barrier innovation and small companies. Google and Android is not small but it is success is largely due to the free availability of it to the masses. The masses ability to review, critique and contribute and then use. Just like other products, java, linux, etc.... I suspect the arguments will sound like those of the drug industry. We invested so much we must protect our investment. As we watch big Pharma die a slow death from protectionism and gaming the patent system. A company that wants to make money needs to add VALUE not put up white picket fences. I provide services to my employers. If I put up picket fences to protect my JOB, I would be fired as soon as possible. We need to fire this type of action. It is friction to innovation not lubricant.
Post a Comment
Read more