Merged from the latest developing branch.
commit3641015641a302d4f3866f549cd6d67ff7c8c6a8
authoredyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Sat, 20 Oct 2007 02:07:34 +0000 (20 02:07 +0000)
committeredyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Sat, 20 Oct 2007 02:07:34 +0000 (20 02:07 +0000)
tree093476bbf2187515394b48a489117416bee20070
parent9022cf6068096f6382069da737292a6ec6c9b679
Merged from the latest developing branch.

git-svn-id: https://vim.svn.sourceforge.net/svnroot/vim/trunk@619 2a77ed30-b011-0410-a7ad-c7884a0aa172
src/diff.c
src/edit.c
src/version.c