core-tutorial: adjust to recent reality.
commit960c7021b3b90f93aa88358435d828e5f4cd1533
authorJunio C Hamano <junkio@cox.net>
Mon, 6 Feb 2006 20:27:33 +0000 (6 12:27 -0800)
committerJunio C Hamano <junkio@cox.net>
Mon, 6 Feb 2006 20:27:33 +0000 (6 12:27 -0800)
treededbe00d313d5ada03a321bd782550b5c3e0757f
parentf22fd75c6a39a72d6bf20786ba889fb73038bec9
core-tutorial: adjust to recent reality.

We still talked about HEAD symlinks but these days we use
symrefs by default.

Also 'failed/prevented' message is now gone from the merge
output.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Documentation/core-tutorial.txt