4aa4975cd7
- enable colors - set meld as merge tool - add aliases/shorthands for frequently used commands
- enable colors - set meld as merge tool - add aliases/shorthands for frequently used commands