Module Name:	pkgsrc
Committed By:	rillig
Date:		Mon Sep 18 22:27:54 UTC 2006

Modified Files:
	pkgsrc/doc/guide/files: faq.xml

Log Message:
Added an FAQ entry for the "Makefile appears to contain unresolved
cvs/rcs/??? merge conflicts" error message.


To generate a diff of this commit:
cvs rdiff -r1.29 -r1.30 pkgsrc/doc/guide/files/faq.xml

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.