]> git.friedersdorff.com Git - max/dotfiles.git/commitdiff
projects / max / dotfiles.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cb2bf16 922ee20)
Merge branch 'master' of github.com:maxf130/dotfiles
authorMaximilian Friedersdorff <maxf130@gmail.com>
Fri, 6 Nov 2015 11:39:36 +0000 (11:39 +0000)
committerMaximilian Friedersdorff <maxf130@gmail.com>
Fri, 6 Nov 2015 11:39:36 +0000 (11:39 +0000)
1  2 
vimrc patch | diff1 | diff2 | blob | history

diff --cc vimrc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.