# HG changeset patch
# User Ludovic Chabant <ludovic@chabant.com>
# Date 1503432495 25200
# Node ID c175fda4aa2e615754694a51c864a5af64e8ff3e
# Parent  92ffe08255e220e20236743c13d175292b4a2a90# Parent  d367df6afcadb7149d0eb55fcd4e74c3b9d1e090
Merged changes.

diff -r 92ffe08255e2 -r c175fda4aa2e vim/vimrc