[user] name = John Doe email = john@doe.com [core] editor = mcedit pager = less -R [merge] tool = meld