salhernandez

Install Meld from their webpage http://meldmerge.org/

I had to tell git where it was:

git config --global merge.tool meld git config --global diff.tool meld

If using windows 8 and 10 use the following git config --global mergetool.meld.path "/c/Program Files (x86)/meld/meld.exe" git config --global difftool.meld.path "/c/Program Files (x86)/meld/meld.exe"

yfyf

#!/bin/bash
#
# Requires openresolv.
#
# This file goes into
#
#     /usr/share/openvpn/update-resolv-conf
#
# And this goes into your OpenVPN conf:
#

laanwj

[
    { "keys": [":",":"], "command": "insert_snippet", "args": {"contents": "∷"}, "context":
        [
            { "key": "selector", "operator": "equal", "operand": "source.haskell" }
        ]
    },
    { "keys": ["-",">"], "command": "insert_snippet", "args": {"contents": "→"}, "context":
        [
            { "key": "selector", "operator": "equal", "operand": "source.haskell" }
        ]