updated git config merge tool and editor