##
# Master file for creating a merge tree
##
# First the setup
setup mc /pub/scm/linux/kernel/git/jejb/merge-tree
errors	/pub/linux/kernel/people/jejb/merge-tree/log-error-
mail	jejb
master /pub/scm/linux/kernel/git/torvalds/linux-2.6.git linus
git /pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git	master		scsi-rc-fixes
git /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git	master		scsi-misc
gitfetch /pub/scm/linux/kernel/git/davem/net-2.6.25.git	master		net
# trivial conflicts in feature-removal.txt and scsi_transport_iscsi.c
merge net resolve /home/jejb/net-resolve.diff
check
label
diff /pub/linux/kernel/people/jejb/merge-tree/patch-
log /pub/linux/kernel/people/jejb/merge-tree/log-