summaryrefslogtreecommitdiff
path: root/.vimrc
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-08-06 17:21:00 +0200
committerLennart Poettering <lennart@poettering.net>2014-08-11 15:06:22 +0200
commit2fb3034cb21c745ed4f9aa4cba57563f7f071466 (patch)
treec49b1f84069cbd67a37f68016b304e8ccf55aed5 /.vimrc
parentc02091d23bd746c176220e8492eeb7c4c62c3e55 (diff)
resolved: be a bit more communicative about conflicts
Diffstat (limited to '.vimrc')
0 files changed, 0 insertions, 0 deletions