Disable saving new docs to iCloud
Comment out unnecessary inputrc entries
Sourcetree use kdiff as its diff tool