Skip to content

Instantly share code, notes, and snippets.

@twalker
Last active August 29, 2015 14:02
Show Gist options
  • Save twalker/802a72763b854f326227 to your computer and use it in GitHub Desktop.
Save twalker/802a72763b854f326227 to your computer and use it in GitHub Desktop.
merge window arrangement for the absent minded
[merge]
cmd = meld "$LOCAL" "$MERGED" "$REMOTE"
tool = meld
# photo at: https://www.dropbox.com/s/jiox4pojpp1fmo6/merge-reminder.png
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment