Date: Mon, 28 May 2012 18:06:07 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r38926 - head/en_US.ISO8859-1/articles/committers-guide Message-ID: <201205281806.q4SI67ir025900@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Mon May 28 18:06:06 2012 New Revision: 38926 URL: http://svn.freebsd.org/changeset/doc/38926 Log: Comment a seemingly unwritten section in the Subversion Primer. Modified: head/en_US.ISO8859-1/articles/committers-guide/article.sgml Modified: head/en_US.ISO8859-1/articles/committers-guide/article.sgml ============================================================================== --- head/en_US.ISO8859-1/articles/committers-guide/article.sgml Mon May 28 17:51:38 2012 (r38925) +++ head/en_US.ISO8859-1/articles/committers-guide/article.sgml Mon May 28 18:06:06 2012 (r38926) @@ -2629,10 +2629,11 @@ $target - head/$source:$P,$Q,$R</screen> <para>It is important to resolve any merge conflicts before committing.</para> - + <!-- <para>To collapse everything back at the end:</para> <screen>&prompt.user; <userinput>svn write me</userinput></screen> + --> </sect3> </sect2>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201205281806.q4SI67ir025900>