.gitconfig: alt alias for merge list with dates
.gitconfig: revert to pre-2.1 merge behavior