[parisc-linux-cvs] build-tools willy

[Matthew Wilcox]

CVSROOT:	/var/cvs
Module name:	build-tools
Changes by:	willy at cvs.parisc-linux.org	2004-11-03 06:48:59

Modified files:
	.              : import-2.6-bk 

Log message:
	- remind myself to cd to the merge directory first
	- eliminate the MESSAGE variable -- do it in the commit message itself
	- auto-edit the files with conflicts
	- tag the merge result
	- autogenerate a diff

Patches:
http://cvs.parisc-linux.org/build-tools/import-2.6-bk.diff?cvsroot=&r1=1.2&r2=1.3