Skip to main content

Popular posts from this blog

Garage Door opener replaced

Our garage door opener has become intermittent, it has to go. It turned into a bit of a research project. We ended up installing a belt drive unit. The bracket was kind of a pain. It is suppose to be much more quiet. I started wearing gloves more for household projects. I love these gloves. Foam Nitrile Coated gloves. Check them out. I got them here. http://www.hardworkinggloves.com/index.php?main_page=product_info&cPath=3_13&products_id=120 Later...
Post a Comment
Read more
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.  ...
Post a Comment
Read more