154 Commits

Author	SHA1	Message	Date
Tim Pope	b65030cd3b	:Gdiff does a three-way during a conflict	2009-10-14 23:38:24 -04:00
Tim Pope	04b845a4e9	Write to index and work tree with :Gwrite	2009-10-14 23:38:17 -04:00
Tim Pope	a02331e78f	Tweak formatting of introduction	2009-10-11 11:48:21 -04:00
Tim Pope	1eb949be95	Initial commit	2009-10-10 20:36:02 -04:00