Merge tool for mac5/2/2023 ![]() ![]() Git config -global "diffmerge -merge -result=\$MERGED \$LOCAL \$BASE \$REMOTE" However git mergetool doesn't support DiffMerge by default, so running these commands in terminal will use DiffMerge as the default git merge tool. Therefore I've been looking for some alternative and found DiffMerge, which is similar to meld and with a better-OS-X-UI-feeling. ![]() Installing meld on OS X was a pain (Now you can simply brew install meld!) because of some dependencies issues. I used to use meld in linux to solve the merge conflicts where it has a simple and straight forward interface (Personally prefer the 3-columns-view).
0 Comments
Leave a Reply.AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |