markSci5/Git Merge Config With Merge Base

Created July 3, 2013 03:32

Star (0) You must be signed in to star a gist
Fork (0) You must be signed in to fork a gist

Select an option

Learn more about clone URLs
Clone this repository at <script src="https://gist.github.com/markSci5/5915254.js"></script>
Save markSci5/5915254 to your computer and use it in GitHub Desktop.

Download ZIP

Git config for merging to see the merge base code

Raw

Git Merge Config With Merge Base

git config --global merge.conflictstyle diff3

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment