[TuT] DiffMerge: merge conflict visual tool - nsyncCSUS/seniorproject GitHub Wiki

*note from stack on merge order link

atom IDE link(Easier Method)

• https://atom.io/packages/merge-conflicts

Diffmerge w/ git mergetools

• https://sourcegear.com/diffmerge/downloads.php
• http://coding4streetcred.com/blog/post/Configure-DiffMerge-for-Your-Git-DiffTool

Note: .gitconfig in C:\Users<Your user name>

• https://www.youtube.com/watch?v=iCGrKFH2oeo

• 7 mins in for how to use