dot/gitconfig.in: Stage merge conflicts fixed up by `git-rerere'.
authorMark Wooding <mdw@distorted.org.uk>
Thu, 23 Feb 2012 10:33:55 +0000 (10:33 +0000)
committerMark Wooding <mdw@distorted.org.uk>
Thu, 23 Feb 2012 10:33:55 +0000 (10:33 +0000)
commit5ccb9ae3198722e9df95d31ae80f44a31453d716
tree890823163da2b093bdb6ebfeab07c5e0dcbd4943
parent436a076de0b61b16a8192380b6ab424c888741ae
dot/gitconfig.in: Stage merge conflicts fixed up by `git-rerere'.
dot/gitconfig.in