We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
*note from stack on merge order link
atom IDE link(Easier Method)
Diffmerge w/ git mergetools
Note: .gitconfig in C:\Users<Your user name>
https://www.youtube.com/watch?v=iCGrKFH2oeo
7 mins in for how to use