Subject: building with conflicts
From: Joe Corneli <[email-masked]>
To: [email-masked]
Date: Thu, 28 Mar 2013 20:28:52 +0100
List-Id: <debbugs-submit.debbugs.gnu.org>

Symbol's value as variable is void: <<<<<<<
make[2]: *** [bootstrap-emacs] Error 1
make[1]: *** [src] Error 2
make: *** [bootstrap] Error 2

Upon further investigation there were unmerged conflicts in
buff-menu.el (not sure how they got there) - but it would be great to
get a warning in advance about unmerged conflicts before make
bootstrap.