This adds a diff.context config option to allow specifying the number of lines of context. This is similar to Mercurial's 'unified' option.