diff .vim/syntax/django.vim @ 61:79c2c3932362

Add hg-svn-merge-branch which does all the steps of merging an hg branch for me.
author Augie Fackler <durin42@gmail.com>
date Tue, 03 Mar 2009 11:32:17 -0600
parents c30d68fbd368
children
line wrap: on
line diff