diff tests/test-merge2.t @ 21629:664c49420d48

vim: use try catch in vim plugin to avoid conflicts
author Ali Vakilzade <ali.vakilzade@gmail.com>
date Sat, 03 May 2014 19:11:51 +0430
parents f2719b387380
children 1850066f9e36
line wrap: on
line diff