ScarletPonytail/notes.txt

Last active November 29, 2018 17:30

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

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

Download ZIP

Git - Kaleidoscope diff checker and merge conflicts

Raw

git mergetool

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