Merge branch 'mz/doc-rebase-abort'

author Junio C Hamano <gitster@pobox.com>

Fri, 22 Jul 2011 21:44:08 +0000 (14:44 -0700)

committer Junio C Hamano <gitster@pobox.com>

Fri, 22 Jul 2011 21:44:08 +0000 (14:44 -0700)
author Junio C Hamano <gitster@pobox.com>
Fri, 22 Jul 2011 21:44:08 +0000 (14:44 -0700)
committer Junio C Hamano <gitster@pobox.com>
Fri, 22 Jul 2011 21:44:08 +0000 (14:44 -0700)
diff --cc Documentation/git-rebase.txt
Simple merge
diff --cc git-rebase.sh
Simple merge
author	Junio C Hamano <gitster@pobox.com>
	Fri, 22 Jul 2011 21:44:08 +0000 (14:44 -0700)
committer	Junio C Hamano <gitster@pobox.com>
	Fri, 22 Jul 2011 21:44:08 +0000 (14:44 -0700)
		1	2
Documentation/git-rebase.txt	patch \|	diff1 \|	diff2 \|	blob \| history
git-rebase.sh	patch \|	diff1 \|	diff2 \|	blob \| history