merge.log.txt

CONFLICT (add/add): Merge conflict in usr.sbin/unbound/daemon/Makefile
Auto-merging usr.sbin/unbound/daemon/Makefile
CONFLICT (add/add): Merge conflict in usr.sbin/unbound/checkconf/Makefile
Auto-merging usr.sbin/unbound/checkconf/Makefile
CONFLICT (add/add): Merge conflict in usr.sbin/unbound/Makefile
Auto-merging usr.sbin/unbound/Makefile
CONFLICT (add/add): Merge conflict in usr.sbin/tcpdump/tcpdump/Makefile
Auto-merging usr.sbin/tcpdump/tcpdump/Makefile
CONFLICT (add/add): Merge conflict in usr.sbin/syslogd/syslog.conf
Auto-merging usr.sbin/syslogd/syslog.conf
CONFLICT (add/add): Merge conflict in usr.sbin/services_mkdb/Makefile
Auto-merging usr.sbin/services_mkdb/Makefile
CONFLICT (add/add): Merge conflict in usr.sbin/sendmail/Makefile
Auto-merging usr.sbin/sendmail/Makefile
CONFLICT (add/add): Merge conflict in usr.sbin/rtsold/Makefile
Auto-merging usr.sbin/rtsold/Makefile
CONFLICT (add/add): Merge conflict in usr.sbin/rpcbind/Makefile
Auto-merging usr.sbin/rpcbind/Makefile
CONFLICT (add/add): Merge conflict in usr.sbin/rpc.ypxfrd/Makefile
Auto-merging usr.sbin/rpc.ypxfrd/Makefile
CONFLICT (add/add): Merge conflict in usr.sbin/rpc.ypupdated/Makefile
Auto-merging usr.sbin/rpc.ypupdated/Makefile
CONFLICT (add/add): Merge conflict in usr.sbin/rpc.yppasswdd/Makefile
Auto-merging usr.sbin/rpc.yppasswdd/Makefile
CONFLICT (add/add): Merge conflict in usr.sbin/rpc.umntall/Makefile
Auto-merging usr.sbin/rpc.umntall/Makefile
CONFLICT (add/add): Merge conflict in usr.sbin/rpc.statd/Makefile
Auto-merging usr.sbin/rpc.statd/Makefile
CONFLICT (add/add): Merge conflict in usr.sbin/rpc.lockd/Makefile
Auto-merging usr.sbin/rpc.lockd/Makefile
CONFLICT (add/add): Merge conflict in usr.sbin/pwd_mkdb/Makefile
Auto-merging usr.sbin/pwd_mkdb/Makefile
CONFLICT (add/add): Merge conflict in usr.sbin/ppp/Makefile
Auto-merging usr.sbin/ppp/Makefile
CONFLICT (add/add): Merge conflict in usr.sbin/pkg/Makefile
Auto-merging usr.sbin/pkg/Makefile
CONFLICT (add/add): Merge conflict in usr.sbin/pkg/FreeBSD.conf.quarterly
Auto-merging usr.sbin/pkg/FreeBSD.conf.quarterly
CONFLICT (add/add): Merge conflict in usr.sbin/pkg/FreeBSD.conf.latest
Auto-merging usr.sbin/pkg/FreeBSD.conf.latest
CONFLICT (add/add): Merge conflict in usr.sbin/ntp/ntpd/Makefile
Auto-merging usr.sbin/ntp/ntpd/Makefile
CONFLICT (add/add): Merge conflict in usr.sbin/ntp/Makefile
Auto-merging usr.sbin/ntp/Makefile
CONFLICT (add/add): Merge conflict in usr.sbin/newsyslog/newsyslog.conf.d/lpr.conf
Auto-merging usr.sbin/newsyslog/newsyslog.conf.d/lpr.conf
CONFLICT (add/add): Merge conflict in usr.sbin/newsyslog/newsyslog.conf.d/amd.conf
Auto-merging usr.sbin/newsyslog/newsyslog.conf.d/amd.conf
CONFLICT (add/add): Merge conflict in usr.sbin/newsyslog/newsyslog.conf
Auto-merging usr.sbin/newsyslog/newsyslog.conf
CONFLICT (add/add): Merge conflict in usr.sbin/mountd/Makefile
Auto-merging usr.sbin/mountd/Makefile
CONFLICT (add/add): Merge conflict in usr.sbin/iscsid/Makefile
Auto-merging usr.sbin/iscsid/Makefile
CONFLICT (add/add): Merge conflict in usr.sbin/inetd/Makefile
Auto-merging usr.sbin/inetd/Makefile
CONFLICT (add/add): Merge conflict in usr.sbin/ctld/Makefile
Auto-merging usr.sbin/ctld/Makefile
CONFLICT (add/add): Merge conflict in usr.sbin/cron/cron/Makefile
Auto-merging usr.sbin/cron/cron/Makefile
CONFLICT (add/add): Merge conflict in usr.sbin/bsdinstall/scripts/zfsboot
Auto-merging usr.sbin/bsdinstall/scripts/zfsboot
CONFLICT (add/add): Merge conflict in usr.sbin/bsdinstall/scripts/wlanconfig
Auto-merging usr.sbin/bsdinstall/scripts/wlanconfig
CONFLICT (add/add): Merge conflict in usr.sbin/bsdinstall/scripts/time
Auto-merging usr.sbin/bsdinstall/scripts/time
CONFLICT (add/add): Merge conflict in usr.sbin/bsdinstall/scripts/services
Auto-merging usr.sbin/bsdinstall/scripts/services
CONFLICT (add/add): Merge conflict in usr.sbin/bsdinstall/scripts/rootpass
Auto-merging usr.sbin/bsdinstall/scripts/rootpass
CONFLICT (add/add): Merge conflict in usr.sbin/bsdinstall/scripts/netconfig_ipv6
Auto-merging usr.sbin/bsdinstall/scripts/netconfig_ipv6
CONFLICT (add/add): Merge conflict in usr.sbin/bsdinstall/scripts/netconfig_ipv4
Auto-merging usr.sbin/bsdinstall/scripts/netconfig_ipv4
CONFLICT (add/add): Merge conflict in usr.sbin/bsdinstall/scripts/netconfig
Auto-merging usr.sbin/bsdinstall/scripts/netconfig
CONFLICT (add/add): Merge conflict in usr.sbin/bsdinstall/scripts/mount
Auto-merging usr.sbin/bsdinstall/scripts/mount
CONFLICT (add/add): Merge conflict in usr.sbin/bsdinstall/scripts/mirrorselect
Auto-merging usr.sbin/bsdinstall/scripts/mirrorselect
CONFLICT (add/add): Merge conflict in usr.sbin/bsdinstall/scripts/keymap
Auto-merging usr.sbin/bsdinstall/scripts/keymap
CONFLICT (add/add): Merge conflict in usr.sbin/bsdinstall/scripts/jail
Auto-merging usr.sbin/bsdinstall/scripts/jail
CONFLICT (add/add): Merge conflict in usr.sbin/bsdinstall/scripts/hostname
Auto-merging usr.sbin/bsdinstall/scripts/hostname
CONFLICT (add/add): Merge conflict in usr.sbin/bsdinstall/scripts/hardening
Auto-merging usr.sbin/bsdinstall/scripts/hardening
CONFLICT (add/add): Merge conflict in usr.sbin/bsdinstall/scripts/docsinstall
Auto-merging usr.sbin/bsdinstall/scripts/docsinstall
CONFLICT (add/add): Merge conflict in usr.sbin/bsdinstall/scripts/config
Auto-merging usr.sbin/bsdinstall/scripts/config
CONFLICT (add/add): Merge conflict in usr.sbin/bsdinstall/scripts/checksum
Auto-merging usr.sbin/bsdinstall/scripts/checksum
CONFLICT (add/add): Merge conflict in usr.sbin/bsdinstall/scripts/auto
Auto-merging usr.sbin/bsdinstall/scripts/auto
CONFLICT (add/add): Merge conflict in usr.sbin/bsdinstall/scripts/adduser
Auto-merging usr.sbin/bsdinstall/scripts/adduser
CONFLICT (add/add): Merge conflict in usr.sbin/bsdinstall/partedit/partedit.c
Auto-merging usr.sbin/bsdinstall/partedit/partedit.c
CONFLICT (add/add): Merge conflict in usr.sbin/bsdinstall/partedit/part_wizard.c
Auto-merging usr.sbin/bsdinstall/partedit/part_wizard.c
CONFLICT (add/add): Merge conflict in usr.sbin/bsdinstall/distfetch/distfetch.c
Auto-merging usr.sbin/bsdinstall/distfetch/distfetch.c
CONFLICT (add/add): Merge conflict in usr.sbin/bsdinstall/distextract/distextract.c
Auto-merging usr.sbin/bsdinstall/distextract/distextract.c
CONFLICT (add/add): Merge conflict in usr.sbin/blacklistd/Makefile
Auto-merging usr.sbin/blacklistd/Makefile
CONFLICT (add/add): Merge conflict in usr.sbin/bhyveload/Makefile
Auto-merging usr.sbin/bhyveload/Makefile
CONFLICT (add/add): Merge conflict in usr.sbin/bhyve/xmsr.c
Auto-merging usr.sbin/bhyve/xmsr.c
CONFLICT (add/add): Merge conflict in usr.sbin/bhyve/bhyverun.c
Auto-merging usr.sbin/bhyve/bhyverun.c
CONFLICT (add/add): Merge conflict in usr.sbin/Makefile
Auto-merging usr.sbin/Makefile
CONFLICT (add/add): Merge conflict in usr.bin/vi/Makefile
Auto-merging usr.bin/vi/Makefile
CONFLICT (add/add): Merge conflict in usr.bin/tsort/Makefile
Auto-merging usr.bin/tsort/Makefile
CONFLICT (add/add): Merge conflict in usr.bin/svn/svn/Makefile
Auto-merging usr.bin/svn/svn/Makefile
CONFLICT (add/add): Merge conflict in usr.bin/svn/Makefile.inc
Auto-merging usr.bin/svn/Makefile.inc
CONFLICT (add/add): Merge conflict in usr.bin/showmount/Makefile
Auto-merging usr.bin/showmount/Makefile
CONFLICT (add/add): Merge conflict in usr.bin/rpcinfo/Makefile
Auto-merging usr.bin/rpcinfo/Makefile
CONFLICT (add/add): Merge conflict in usr.bin/rpcgen/Makefile
Auto-merging usr.bin/rpcgen/Makefile
CONFLICT (add/add): Merge conflict in usr.bin/procstat/procstat_auxv.c
Auto-merging usr.bin/procstat/procstat_auxv.c
CONFLICT (add/add): Merge conflict in usr.bin/nm/Makefile
Auto-merging usr.bin/nm/Makefile
CONFLICT (add/add): Merge conflict in usr.bin/nc/Makefile
Auto-merging usr.bin/nc/Makefile
CONFLICT (add/add): Merge conflict in usr.bin/mail/Makefile
Auto-merging usr.bin/mail/Makefile
CONFLICT (add/add): Merge conflict in usr.bin/login/motd.template
Auto-merging usr.bin/login/motd.template
CONFLICT (add/add): Merge conflict in usr.bin/login/login.conf
Auto-merging usr.bin/login/login.conf
CONFLICT (add/add): Merge conflict in usr.bin/logger/logger.c
Auto-merging usr.bin/logger/logger.c
CONFLICT (add/add): Merge conflict in usr.bin/grep/Makefile
Auto-merging usr.bin/grep/Makefile
CONFLICT (add/add): Merge conflict in usr.bin/clang/llvm.prog.mk
Auto-merging usr.bin/clang/llvm.prog.mk
CONFLICT (add/add): Merge conflict in usr.bin/clang/llvm-objdump/Makefile
Auto-merging usr.bin/clang/llvm-objdump/Makefile
CONFLICT (add/add): Merge conflict in usr.bin/clang/llvm-nm/Makefile
Auto-merging usr.bin/clang/llvm-nm/Makefile
CONFLICT (add/add): Merge conflict in usr.bin/clang/llvm-ar/Makefile
Auto-merging usr.bin/clang/llvm-ar/Makefile
CONFLICT (add/add): Merge conflict in usr.bin/clang/lld/Makefile
Auto-merging usr.bin/clang/lld/Makefile
CONFLICT (add/add): Merge conflict in usr.bin/clang/clang.prog.mk
Auto-merging usr.bin/clang/clang.prog.mk
CONFLICT (add/add): Merge conflict in usr.bin/clang/Makefile.inc
Auto-merging usr.bin/clang/Makefile.inc
CONFLICT (add/add): Merge conflict in usr.bin/cap_mkdb/Makefile
Auto-merging usr.bin/cap_mkdb/Makefile
CONFLICT (add/add): Merge conflict in usr.bin/calendar/Makefile
Auto-merging usr.bin/calendar/Makefile
CONFLICT (add/add): Merge conflict in usr.bin/ar/Makefile
Auto-merging usr.bin/ar/Makefile
CONFLICT (add/add): Merge conflict in usr.bin/Makefile
Auto-merging usr.bin/Makefile
CONFLICT (add/add): Merge conflict in tools/tools/nanobsd/embedded/qemu-powerpc64.cfg
Auto-merging tools/tools/nanobsd/embedded/qemu-powerpc64.cfg
CONFLICT (add/add): Merge conflict in tools/build/mk/OptionalObsoleteFiles.inc
Auto-merging tools/build/mk/OptionalObsoleteFiles.inc
CONFLICT (add/add): Merge conflict in tools/boot/install-boot.sh
Auto-merging tools/boot/install-boot.sh
CONFLICT (add/add): Merge conflict in tests/sys/kern/kern_copyin.c
Auto-merging tests/sys/kern/kern_copyin.c
CONFLICT (add/add): Merge conflict in targets/pseudo/userland/share/Makefile.depend
Auto-merging targets/pseudo/userland/share/Makefile.depend
CONFLICT (add/add): Merge conflict in targets/pseudo/bootstrap-tools/Makefile
Auto-merging targets/pseudo/bootstrap-tools/Makefile
CONFLICT (add/add): Merge conflict in sys/x86/x86/mp_x86.c
Auto-merging sys/x86/x86/mp_x86.c
CONFLICT (add/add): Merge conflict in sys/x86/x86/identcpu.c
Auto-merging sys/x86/x86/identcpu.c
CONFLICT (add/add): Merge conflict in sys/x86/x86/cpu_machdep.c
Auto-merging sys/x86/x86/cpu_machdep.c
CONFLICT (add/add): Merge conflict in sys/x86/include/specialreg.h
Auto-merging sys/x86/include/specialreg.h
CONFLICT (add/add): Merge conflict in sys/vm/vm_unix.c
Auto-merging sys/vm/vm_unix.c
CONFLICT (add/add): Merge conflict in sys/vm/vm_phys.c
Auto-merging sys/vm/vm_phys.c
CONFLICT (add/add): Merge conflict in sys/vm/vm_mmap.c
Auto-merging sys/vm/vm_mmap.c
CONFLICT (add/add): Merge conflict in sys/vm/vm_map.h
Auto-merging sys/vm/vm_map.h
CONFLICT (add/add): Merge conflict in sys/vm/vm_map.c
Auto-merging sys/vm/vm_map.c
CONFLICT (add/add): Merge conflict in sys/sys/sysent.h
Auto-merging sys/sys/sysent.h
CONFLICT (add/add): Merge conflict in sys/sys/sysctl.h
Auto-merging sys/sys/sysctl.h
CONFLICT (add/add): Merge conflict in sys/sys/proc.h
Auto-merging sys/sys/proc.h
CONFLICT (add/add): Merge conflict in sys/sys/priv.h
Auto-merging sys/sys/priv.h
CONFLICT (add/add): Merge conflict in sys/sys/mount.h
Auto-merging sys/sys/mount.h
CONFLICT (add/add): Merge conflict in sys/sys/ktr_class.h
Auto-merging sys/sys/ktr_class.h
CONFLICT (add/add): Merge conflict in sys/sys/kernel.h
Auto-merging sys/sys/kernel.h
CONFLICT (add/add): Merge conflict in sys/sys/jail.h
Auto-merging sys/sys/jail.h
CONFLICT (add/add): Merge conflict in sys/sys/imgact_elf.h
Auto-merging sys/sys/imgact_elf.h
CONFLICT (add/add): Merge conflict in sys/sys/imgact.h
Auto-merging sys/sys/imgact.h
CONFLICT (add/add): Merge conflict in sys/sys/elf_common.h
Auto-merging sys/sys/elf_common.h
CONFLICT (add/add): Merge conflict in sys/sys/copyright.h
Auto-merging sys/sys/copyright.h
CONFLICT (add/add): Merge conflict in sys/security/mac/mac_policy.h
Auto-merging sys/security/mac/mac_policy.h
CONFLICT (add/add): Merge conflict in sys/security/mac/mac_framework.h
Auto-merging sys/security/mac/mac_framework.h
CONFLICT (add/add): Merge conflict in sys/riscv/riscv/machdep.c
Auto-merging sys/riscv/riscv/machdep.c
CONFLICT (add/add): Merge conflict in sys/riscv/riscv/elf_machdep.c
Auto-merging sys/riscv/riscv/elf_machdep.c
CONFLICT (add/add): Merge conflict in sys/powerpc/powerpc/exec_machdep.c
Auto-merging sys/powerpc/powerpc/exec_machdep.c
CONFLICT (add/add): Merge conflict in sys/powerpc/powerpc/elf64_machdep.c
Auto-merging sys/powerpc/powerpc/elf64_machdep.c
CONFLICT (add/add): Merge conflict in sys/powerpc/powerpc/elf32_machdep.c
Auto-merging sys/powerpc/powerpc/elf32_machdep.c
CONFLICT (add/add): Merge conflict in sys/netinet6/nd6_rtr.c
Auto-merging sys/netinet6/nd6_rtr.c
CONFLICT (add/add): Merge conflict in sys/netinet6/in6_src.c
Auto-merging sys/netinet6/in6_src.c
CONFLICT (add/add): Merge conflict in sys/netinet6/in6_proto.c
Auto-merging sys/netinet6/in6_proto.c
CONFLICT (add/add): Merge conflict in sys/netinet/ip_reass.c
Auto-merging sys/netinet/ip_reass.c
CONFLICT (add/add): Merge conflict in sys/netinet/ip_input.c
Auto-merging sys/netinet/ip_input.c
CONFLICT (add/add): Merge conflict in sys/netinet/ip_id.c
Auto-merging sys/netinet/ip_id.c
CONFLICT (add/add): Merge conflict in sys/netinet/ip_icmp.c
Auto-merging sys/netinet/ip_icmp.c
CONFLICT (add/add): Merge conflict in sys/modules/bhnd/Makefile
Auto-merging sys/modules/bhnd/Makefile
CONFLICT (add/add): Merge conflict in sys/modules/Makefile
Auto-merging sys/modules/Makefile
CONFLICT (add/add): Merge conflict in sys/mips/mips/pm_machdep.c
Auto-merging sys/mips/mips/pm_machdep.c
CONFLICT (add/add): Merge conflict in sys/mips/mips/freebsd32_machdep.c
Auto-merging sys/mips/mips/freebsd32_machdep.c
CONFLICT (add/add): Merge conflict in sys/mips/mips/elf_machdep.c
Auto-merging sys/mips/mips/elf_machdep.c
CONFLICT (add/add): Merge conflict in sys/mips/conf/ONIONOMEGA
Auto-merging sys/mips/conf/ONIONOMEGA
CONFLICT (add/add): Merge conflict in sys/mips/conf/OCTEON1
Auto-merging sys/mips/conf/OCTEON1
CONFLICT (add/add): Merge conflict in sys/mips/conf/MALTAEL
Auto-merging sys/mips/conf/MALTAEL
CONFLICT (add/add): Merge conflict in sys/mips/conf/MALTA64EL
Auto-merging sys/mips/conf/MALTA64EL
CONFLICT (add/add): Merge conflict in sys/mips/conf/MALTA64
Auto-merging sys/mips/conf/MALTA64
CONFLICT (add/add): Merge conflict in sys/mips/conf/MALTA
Auto-merging sys/mips/conf/MALTA
CONFLICT (add/add): Merge conflict in sys/mips/conf/ERL
Auto-merging sys/mips/conf/ERL
CONFLICT (add/add): Merge conflict in sys/libkern/iconv.c
Auto-merging sys/libkern/iconv.c
CONFLICT (add/add): Merge conflict in sys/kern/vfs_syscalls.c
Auto-merging sys/kern/vfs_syscalls.c
CONFLICT (add/add): Merge conflict in sys/kern/vfs_mount.c
Auto-merging sys/kern/vfs_mount.c
CONFLICT (add/add): Merge conflict in sys/kern/tty_info.c
Auto-merging sys/kern/tty_info.c
CONFLICT (add/add): Merge conflict in sys/kern/sys_process.c
Auto-merging sys/kern/sys_process.c
CONFLICT (add/add): Merge conflict in sys/kern/subr_witness.c
Auto-merging sys/kern/subr_witness.c
CONFLICT (add/add): Merge conflict in sys/kern/subr_prf.c
Auto-merging sys/kern/subr_prf.c
CONFLICT (add/add): Merge conflict in sys/kern/subr_msgbuf.c
Auto-merging sys/kern/subr_msgbuf.c
CONFLICT (add/add): Merge conflict in sys/kern/subr_module.c
Auto-merging sys/kern/subr_module.c
CONFLICT (add/add): Merge conflict in sys/kern/kern_thread.c
Auto-merging sys/kern/kern_thread.c
CONFLICT (add/add): Merge conflict in sys/kern/kern_thr.c
Auto-merging sys/kern/kern_thr.c
CONFLICT (add/add): Merge conflict in sys/kern/kern_sysctl.c
Auto-merging sys/kern/kern_sysctl.c
CONFLICT (add/add): Merge conflict in sys/kern/kern_sig.c
Auto-merging sys/kern/kern_sig.c
CONFLICT (add/add): Merge conflict in sys/kern/kern_shutdown.c
Auto-merging sys/kern/kern_shutdown.c
CONFLICT (add/add): Merge conflict in sys/kern/kern_resource.c
Auto-merging sys/kern/kern_resource.c
CONFLICT (add/add): Merge conflict in sys/kern/kern_racct.c
Auto-merging sys/kern/kern_racct.c
CONFLICT (add/add): Merge conflict in sys/kern/kern_prot.c
Auto-merging sys/kern/kern_prot.c
CONFLICT (add/add): Merge conflict in sys/kern/kern_proc.c
Auto-merging sys/kern/kern_proc.c
CONFLICT (add/add): Merge conflict in sys/kern/kern_priv.c
Auto-merging sys/kern/kern_priv.c
CONFLICT (add/add): Merge conflict in sys/kern/kern_module.c
Auto-merging sys/kern/kern_module.c
CONFLICT (add/add): Merge conflict in sys/kern/kern_mib.c
Auto-merging sys/kern/kern_mib.c
CONFLICT (add/add): Merge conflict in sys/kern/kern_linker.c
Auto-merging sys/kern/kern_linker.c
CONFLICT (add/add): Merge conflict in sys/kern/kern_jail.c
Auto-merging sys/kern/kern_jail.c
CONFLICT (add/add): Merge conflict in sys/kern/kern_fork.c
Auto-merging sys/kern/kern_fork.c
CONFLICT (add/add): Merge conflict in sys/kern/kern_exec.c
Auto-merging sys/kern/kern_exec.c
CONFLICT (add/add): Merge conflict in sys/kern/init_main.c
Auto-merging sys/kern/init_main.c
CONFLICT (add/add): Merge conflict in sys/kern/imgact_elf.c
Auto-merging sys/kern/imgact_elf.c
CONFLICT (add/add): Merge conflict in sys/i386/linux/linux_sysvec.c
Auto-merging sys/i386/linux/linux_sysvec.c
CONFLICT (add/add): Merge conflict in sys/i386/i386/machdep.c
Auto-merging sys/i386/i386/machdep.c
CONFLICT (add/add): Merge conflict in sys/i386/i386/elf_machdep.c
Auto-merging sys/i386/i386/elf_machdep.c
CONFLICT (add/add): Merge conflict in sys/i386/conf/NOTES
Auto-merging sys/i386/conf/NOTES
CONFLICT (add/add): Merge conflict in sys/i386/cloudabi32/cloudabi32_sysvec.c
Auto-merging sys/i386/cloudabi32/cloudabi32_sysvec.c
CONFLICT (add/add): Merge conflict in sys/geom/geom_kern.c
Auto-merging sys/geom/geom_kern.c
CONFLICT (add/add): Merge conflict in sys/fs/tmpfs/tmpfs_vnops.c
Auto-merging sys/fs/tmpfs/tmpfs_vnops.c
CONFLICT (add/add): Merge conflict in sys/fs/tmpfs/tmpfs_subr.c
Auto-merging sys/fs/tmpfs/tmpfs_subr.c
CONFLICT (add/add): Merge conflict in sys/fs/tmpfs/tmpfs.h
Auto-merging sys/fs/tmpfs/tmpfs.h
CONFLICT (add/add): Merge conflict in sys/fs/procfs/procfs_regs.c
Auto-merging sys/fs/procfs/procfs_regs.c
CONFLICT (add/add): Merge conflict in sys/fs/procfs/procfs_mem.c
Auto-merging sys/fs/procfs/procfs_mem.c
CONFLICT (add/add): Merge conflict in sys/fs/procfs/procfs_fpregs.c
Auto-merging sys/fs/procfs/procfs_fpregs.c
CONFLICT (add/add): Merge conflict in sys/fs/procfs/procfs_dbregs.c
Auto-merging sys/fs/procfs/procfs_dbregs.c
CONFLICT (add/add): Merge conflict in sys/dev/sound/pcm/mixer.c
Auto-merging sys/dev/sound/pcm/mixer.c
CONFLICT (add/add): Merge conflict in sys/dev/sound/pcm/dsp.c
Auto-merging sys/dev/sound/pcm/dsp.c
CONFLICT (add/add): Merge conflict in sys/dev/random/fortuna.c
Auto-merging sys/dev/random/fortuna.c
CONFLICT (add/add): Merge conflict in sys/dev/netmap/netmap_freebsd.c
Auto-merging sys/dev/netmap/netmap_freebsd.c
CONFLICT (add/add): Merge conflict in sys/dev/kbd/kbd.c
Auto-merging sys/dev/kbd/kbd.c
CONFLICT (add/add): Merge conflict in sys/ddb/db_ps.c
Auto-merging sys/ddb/db_ps.c
CONFLICT (add/add): Merge conflict in sys/contrib/openzfs/lib/libzfs/os/freebsd/libzfs_compat.c
Auto-merging sys/contrib/openzfs/lib/libzfs/os/freebsd/libzfs_compat.c
CONFLICT (add/add): Merge conflict in sys/conf/options.i386
Auto-merging sys/conf/options.i386
CONFLICT (add/add): Merge conflict in sys/conf/options.arm64
Auto-merging sys/conf/options.arm64
CONFLICT (add/add): Merge conflict in sys/conf/options.amd64
Auto-merging sys/conf/options.amd64
CONFLICT (add/add): Merge conflict in sys/conf/options
Auto-merging sys/conf/options
CONFLICT (add/add): Merge conflict in sys/conf/newvers.sh
Auto-merging sys/conf/newvers.sh
CONFLICT (add/add): Merge conflict in sys/conf/kmod.mk
Auto-merging sys/conf/kmod.mk
CONFLICT (add/add): Merge conflict in sys/conf/kern.opts.mk
Auto-merging sys/conf/kern.opts.mk
CONFLICT (add/add): Merge conflict in sys/conf/kern.mk
Auto-merging sys/conf/kern.mk
CONFLICT (add/add): Merge conflict in sys/conf/files.i386
Auto-merging sys/conf/files.i386
CONFLICT (add/add): Merge conflict in sys/conf/files
Auto-merging sys/conf/files
CONFLICT (add/add): Merge conflict in sys/conf/NOTES
Auto-merging sys/conf/NOTES
CONFLICT (add/add): Merge conflict in sys/compat/linux/linux_mmap.c
Auto-merging sys/compat/linux/linux_mmap.c
CONFLICT (add/add): Merge conflict in sys/compat/linprocfs/linprocfs.c
Auto-merging sys/compat/linprocfs/linprocfs.c
CONFLICT (add/add): Merge conflict in sys/compat/ia32/ia32_sysvec.c
Auto-merging sys/compat/ia32/ia32_sysvec.c
CONFLICT (add/add): Merge conflict in sys/compat/freebsd32/freebsd32_misc.c
Auto-merging sys/compat/freebsd32/freebsd32_misc.c
CONFLICT (add/add): Merge conflict in sys/compat/cloudabi64/cloudabi64_module.c
Auto-merging sys/compat/cloudabi64/cloudabi64_module.c
CONFLICT (add/add): Merge conflict in sys/arm64/linux/linux_sysvec.c
Auto-merging sys/arm64/linux/linux_sysvec.c
CONFLICT (add/add): Merge conflict in sys/arm64/arm64/pmap.c
Auto-merging sys/arm64/arm64/pmap.c
CONFLICT (add/add): Merge conflict in sys/arm64/arm64/machdep.c
Auto-merging sys/arm64/arm64/machdep.c
CONFLICT (add/add): Merge conflict in sys/arm64/arm64/elf_machdep.c
Auto-merging sys/arm64/arm64/elf_machdep.c
CONFLICT (add/add): Merge conflict in sys/arm/arm/machdep.c
Auto-merging sys/arm/arm/machdep.c
CONFLICT (add/add): Merge conflict in sys/arm/arm/elf_machdep.c
Auto-merging sys/arm/arm/elf_machdep.c
CONFLICT (add/add): Merge conflict in sys/amd64/vmm/x86.c
Auto-merging sys/amd64/vmm/x86.c
CONFLICT (add/add): Merge conflict in sys/amd64/linux32/linux32_sysvec.c
Auto-merging sys/amd64/linux32/linux32_sysvec.c
CONFLICT (add/add): Merge conflict in sys/amd64/linux/linux_sysvec.c
Auto-merging sys/amd64/linux/linux_sysvec.c
CONFLICT (add/add): Merge conflict in sys/amd64/include/vmparam.h
Auto-merging sys/amd64/include/vmparam.h
CONFLICT (add/add): Merge conflict in sys/amd64/ia32/ia32_syscall.c
Auto-merging sys/amd64/ia32/ia32_syscall.c
CONFLICT (add/add): Merge conflict in sys/amd64/ia32/ia32_signal.c
Auto-merging sys/amd64/ia32/ia32_signal.c
CONFLICT (add/add): Merge conflict in sys/amd64/conf/NOTES
Auto-merging sys/amd64/conf/NOTES
CONFLICT (add/add): Merge conflict in sys/amd64/cloudabi64/cloudabi64_sysvec.c
Auto-merging sys/amd64/cloudabi64/cloudabi64_sysvec.c
CONFLICT (add/add): Merge conflict in sys/amd64/amd64/pmap.c
Auto-merging sys/amd64/amd64/pmap.c
CONFLICT (add/add): Merge conflict in sys/amd64/amd64/machdep.c
Auto-merging sys/amd64/amd64/machdep.c
CONFLICT (add/add): Merge conflict in sys/amd64/amd64/initcpu.c
Auto-merging sys/amd64/amd64/initcpu.c
CONFLICT (add/add): Merge conflict in sys/amd64/amd64/elf_machdep.c
Auto-merging sys/amd64/amd64/elf_machdep.c
CONFLICT (add/add): Merge conflict in stand/usb/Makefile
Auto-merging stand/usb/Makefile
CONFLICT (add/add): Merge conflict in stand/lua/drawer.lua
Auto-merging stand/lua/drawer.lua
CONFLICT (add/add): Merge conflict in stand/lua/Makefile
Auto-merging stand/lua/Makefile
CONFLICT (add/add): Merge conflict in stand/loader.mk
Auto-merging stand/loader.mk
CONFLICT (add/add): Merge conflict in stand/libsa32/Makefile
Auto-merging stand/libsa32/Makefile
CONFLICT (add/add): Merge conflict in stand/liblua32/Makefile
Auto-merging stand/liblua32/Makefile
CONFLICT (add/add): Merge conflict in stand/i386/Makefile.inc
Auto-merging stand/i386/Makefile.inc
CONFLICT (add/add): Merge conflict in stand/forth/menu.4th
Auto-merging stand/forth/menu.4th
CONFLICT (add/add): Merge conflict in stand/forth/brand.4th
Auto-merging stand/forth/brand.4th
CONFLICT (add/add): Merge conflict in stand/forth/beastie.4th
Auto-merging stand/forth/beastie.4th
CONFLICT (add/add): Merge conflict in stand/forth/Makefile
Auto-merging stand/forth/Makefile
CONFLICT (add/add): Merge conflict in stand/ficl32/Makefile
Auto-merging stand/ficl32/Makefile
CONFLICT (add/add): Merge conflict in stand/ficl/Makefile
Auto-merging stand/ficl/Makefile
CONFLICT (add/add): Merge conflict in stand/fdt/Makefile
Auto-merging stand/fdt/Makefile
CONFLICT (add/add): Merge conflict in stand/efi/loader/arch/arm64/Makefile.inc
Auto-merging stand/efi/loader/arch/arm64/Makefile.inc
CONFLICT (add/add): Merge conflict in stand/efi/loader/Makefile
Auto-merging stand/efi/loader/Makefile
CONFLICT (add/add): Merge conflict in stand/efi/libefi/Makefile
Auto-merging stand/efi/libefi/Makefile
CONFLICT (add/add): Merge conflict in stand/defs.mk
Auto-merging stand/defs.mk
CONFLICT (add/add): Merge conflict in stand/defaults/loader.conf
Auto-merging stand/defaults/loader.conf
CONFLICT (add/add): Merge conflict in share/mk/sys.mk
Auto-merging share/mk/sys.mk
CONFLICT (add/add): Merge conflict in share/mk/src.opts.mk
Auto-merging share/mk/src.opts.mk
CONFLICT (add/add): Merge conflict in share/mk/src.libnames.mk
Auto-merging share/mk/src.libnames.mk
CONFLICT (add/add): Merge conflict in share/mk/bsd.test.mk
Auto-merging share/mk/bsd.test.mk
CONFLICT (add/add): Merge conflict in share/mk/bsd.prog.mk
Auto-merging share/mk/bsd.prog.mk
CONFLICT (add/add): Merge conflict in share/mk/bsd.opts.mk
Auto-merging share/mk/bsd.opts.mk
CONFLICT (add/add): Merge conflict in share/mk/bsd.lib.mk
Auto-merging share/mk/bsd.lib.mk
CONFLICT (add/add): Merge conflict in share/mk/bsd.init.mk
Auto-merging share/mk/bsd.init.mk
CONFLICT (add/add): Merge conflict in share/mk/bsd.crunchgen.mk
Auto-merging share/mk/bsd.crunchgen.mk
CONFLICT (add/add): Merge conflict in share/mk/bsd.compiler.mk
Auto-merging share/mk/bsd.compiler.mk
CONFLICT (add/add): Merge conflict in share/mk/Makefile
Auto-merging share/mk/Makefile
CONFLICT (add/add): Merge conflict in share/man/man9/sysctl.9
Auto-merging share/man/man9/sysctl.9
CONFLICT (add/add): Merge conflict in share/man/man5/src.conf.5
Auto-merging share/man/man5/src.conf.5
CONFLICT (add/add): Merge conflict in share/man/man5/Makefile
Auto-merging share/man/man5/Makefile
CONFLICT (add/add): Merge conflict in share/man/man4/Makefile
Auto-merging share/man/man4/Makefile
CONFLICT (add/add): Merge conflict in share/keys/pkg/trusted/Makefile
Auto-merging share/keys/pkg/trusted/Makefile
CONFLICT (add/add): Merge conflict in share/keys/Makefile
Auto-merging share/keys/Makefile
CONFLICT (add/add): Merge conflict in share/examples/bhyve/vmrun.sh
Auto-merging share/examples/bhyve/vmrun.sh
CONFLICT (add/add): Merge conflict in share/examples/Makefile
Auto-merging share/examples/Makefile
CONFLICT (add/add): Merge conflict in sbin/mount_nfs/Makefile
Auto-merging sbin/mount_nfs/Makefile
CONFLICT (add/add): Merge conflict in sbin/md5/Makefile
Auto-merging sbin/md5/Makefile
CONFLICT (add/add): Merge conflict in sbin/ldconfig/Makefile
Auto-merging sbin/ldconfig/Makefile
CONFLICT (add/add): Merge conflict in sbin/init/ttys.powerpc
Auto-merging sbin/init/ttys.powerpc
CONFLICT (add/add): Merge conflict in sbin/init/ttys.mips
Auto-merging sbin/init/ttys.mips
CONFLICT (add/add): Merge conflict in sbin/init/ttys.i386
Auto-merging sbin/init/ttys.i386
CONFLICT (add/add): Merge conflict in sbin/init/ttys.arm
Auto-merging sbin/init/ttys.arm
CONFLICT (add/add): Merge conflict in sbin/init/ttys.amd64
Auto-merging sbin/init/ttys.amd64
CONFLICT (add/add): Merge conflict in sbin/init/ttys.aarch64
Auto-merging sbin/init/ttys.aarch64
CONFLICT (add/add): Merge conflict in sbin/init/Makefile
Auto-merging sbin/init/Makefile
CONFLICT (add/add): Merge conflict in sbin/geom/Makefile
Auto-merging sbin/geom/Makefile
CONFLICT (add/add): Merge conflict in sbin/devd/devd.conf
Auto-merging sbin/devd/devd.conf
CONFLICT (add/add): Merge conflict in sbin/devd/Makefile
Auto-merging sbin/devd/Makefile
CONFLICT (add/add): Merge conflict in rescue/rescue/Makefile
Auto-merging rescue/rescue/Makefile
CONFLICT (add/add): Merge conflict in rescue/librescue/Makefile
Auto-merging rescue/librescue/Makefile
CONFLICT (add/add): Merge conflict in release/scripts/pkg-stage.sh
Auto-merging release/scripts/pkg-stage.sh
CONFLICT (add/add): Merge conflict in release/release.sh
Auto-merging release/release.sh
CONFLICT (add/add): Merge conflict in release/rc.local
Auto-merging release/rc.local
CONFLICT (add/add): Merge conflict in release/pkg_repos/release-dvd.conf
Auto-merging release/pkg_repos/release-dvd.conf
CONFLICT (add/add): Merge conflict in release/packages/Makefile.package
Auto-merging release/packages/Makefile.package
CONFLICT (add/add): Merge conflict in release/arm64/make-memstick.sh
Auto-merging release/arm64/make-memstick.sh
CONFLICT (add/add): Merge conflict in release/amd64/mkisoimages.sh
Auto-merging release/amd64/mkisoimages.sh
CONFLICT (add/add): Merge conflict in release/amd64/make-memstick.sh
Auto-merging release/amd64/make-memstick.sh
CONFLICT (add/add): Merge conflict in release/Makefile
Auto-merging release/Makefile
CONFLICT (add/add): Merge conflict in libexec/rtld-elf/rtld.c
Auto-merging libexec/rtld-elf/rtld.c
CONFLICT (add/add): Merge conflict in libexec/rtld-elf/rtld-libc/Makefile.inc
Auto-merging libexec/rtld-elf/rtld-libc/Makefile.inc
CONFLICT (add/add): Merge conflict in libexec/rtld-elf/amd64/rtld_machdep.h
Auto-merging libexec/rtld-elf/amd64/rtld_machdep.h
CONFLICT (add/add): Merge conflict in libexec/rtld-elf/amd64/Makefile.inc
Auto-merging libexec/rtld-elf/amd64/Makefile.inc
CONFLICT (add/add): Merge conflict in libexec/rtld-elf/aarch64/rtld_machdep.h
Auto-merging libexec/rtld-elf/aarch64/rtld_machdep.h
CONFLICT (add/add): Merge conflict in libexec/rtld-elf/Makefile
Auto-merging libexec/rtld-elf/Makefile
CONFLICT (add/add): Merge conflict in libexec/rc/rc.d/motd
Auto-merging libexec/rc/rc.d/motd
CONFLICT (add/add): Merge conflict in libexec/rc/rc.d/dmesg
Auto-merging libexec/rc/rc.d/dmesg
CONFLICT (add/add): Merge conflict in libexec/rc/rc.d/Makefile
Auto-merging libexec/rc/rc.d/Makefile
CONFLICT (add/add): Merge conflict in libexec/rc/rc.conf
Auto-merging libexec/rc/rc.conf
CONFLICT (add/add): Merge conflict in lib/libvmmapi/vmmapi.c
Auto-merging lib/libvmmapi/vmmapi.c
CONFLICT (add/add): Merge conflict in lib/libthr/thread/thr_stack.c
Auto-merging lib/libthr/thread/thr_stack.c
CONFLICT (add/add): Merge conflict in lib/librt/Makefile
Auto-merging lib/librt/Makefile
CONFLICT (add/add): Merge conflict in lib/libexecinfo/Makefile
Auto-merging lib/libexecinfo/Makefile
CONFLICT (add/add): Merge conflict in lib/libclang_rt/safestack/Makefile
Auto-merging lib/libclang_rt/safestack/Makefile
CONFLICT (add/add): Merge conflict in lib/libclang_rt/cfi/Makefile
Auto-merging lib/libclang_rt/cfi/Makefile
CONFLICT (add/add): Merge conflict in lib/libclang_rt/Makefile
Auto-merging lib/libclang_rt/Makefile
CONFLICT (add/add): Merge conflict in lib/libc/tests/tls/Makefile
Auto-merging lib/libc/tests/tls/Makefile
CONFLICT (add/add): Merge conflict in lib/libc/tests/stdlib/Makefile
Auto-merging lib/libc/tests/stdlib/Makefile
CONFLICT (add/add): Merge conflict in lib/libc/stdlib/memory.3
Auto-merging lib/libc/stdlib/memory.3
CONFLICT (add/add): Merge conflict in lib/libc/gen/setproctitle.c
Auto-merging lib/libc/gen/setproctitle.c
CONFLICT (add/add): Merge conflict in lib/clang/llvm.build.mk
Auto-merging lib/clang/llvm.build.mk
CONFLICT (add/add): Merge conflict in lib/clang/libllvm/Makefile
Auto-merging lib/clang/libllvm/Makefile
CONFLICT (add/add): Merge conflict in lib/clang/liblldb/Makefile
Auto-merging lib/clang/liblldb/Makefile
CONFLICT (add/add): Merge conflict in lib/clang/Makefile.inc
Auto-merging lib/clang/Makefile.inc
CONFLICT (add/add): Merge conflict in lib/Makefile
Auto-merging lib/Makefile
CONFLICT (add/add): Merge conflict in kerberos5/usr.sbin/ktutil/Makefile
Auto-merging kerberos5/usr.sbin/ktutil/Makefile
CONFLICT (add/add): Merge conflict in kerberos5/usr.sbin/kstash/Makefile
Auto-merging kerberos5/usr.sbin/kstash/Makefile
CONFLICT (add/add): Merge conflict in kerberos5/usr.sbin/iprop-log/Makefile
Auto-merging kerberos5/usr.sbin/iprop-log/Makefile
CONFLICT (add/add): Merge conflict in kerberos5/usr.bin/verify_krb5_conf/Makefile
Auto-merging kerberos5/usr.bin/verify_krb5_conf/Makefile
CONFLICT (add/add): Merge conflict in kerberos5/usr.bin/string2key/Makefile
Auto-merging kerberos5/usr.bin/string2key/Makefile
CONFLICT (add/add): Merge conflict in kerberos5/usr.bin/ksu/Makefile
Auto-merging kerberos5/usr.bin/ksu/Makefile
CONFLICT (add/add): Merge conflict in kerberos5/usr.bin/kpasswd/Makefile
Auto-merging kerberos5/usr.bin/kpasswd/Makefile
CONFLICT (add/add): Merge conflict in kerberos5/usr.bin/kinit/Makefile
Auto-merging kerberos5/usr.bin/kinit/Makefile
CONFLICT (add/add): Merge conflict in kerberos5/usr.bin/kgetcred/Makefile
Auto-merging kerberos5/usr.bin/kgetcred/Makefile
CONFLICT (add/add): Merge conflict in kerberos5/usr.bin/kf/Makefile
Auto-merging kerberos5/usr.bin/kf/Makefile
CONFLICT (add/add): Merge conflict in kerberos5/usr.bin/kdestroy/Makefile
Auto-merging kerberos5/usr.bin/kdestroy/Makefile
CONFLICT (add/add): Merge conflict in kerberos5/usr.bin/kcc/Makefile
Auto-merging kerberos5/usr.bin/kcc/Makefile
CONFLICT (add/add): Merge conflict in kerberos5/usr.bin/kadmin/Makefile
Auto-merging kerberos5/usr.bin/kadmin/Makefile
CONFLICT (add/add): Merge conflict in kerberos5/usr.bin/hxtool/Makefile
Auto-merging kerberos5/usr.bin/hxtool/Makefile
CONFLICT (add/add): Merge conflict in kerberos5/tools/slc/Makefile
Auto-merging kerberos5/tools/slc/Makefile
CONFLICT (add/add): Merge conflict in kerberos5/tools/asn1_compile/Makefile
Auto-merging kerberos5/tools/asn1_compile/Makefile
CONFLICT (add/add): Merge conflict in kerberos5/libexec/kpasswdd/Makefile
Auto-merging kerberos5/libexec/kpasswdd/Makefile
CONFLICT (add/add): Merge conflict in kerberos5/libexec/kimpersonate/Makefile
Auto-merging kerberos5/libexec/kimpersonate/Makefile
CONFLICT (add/add): Merge conflict in kerberos5/libexec/kfd/Makefile
Auto-merging kerberos5/libexec/kfd/Makefile
CONFLICT (add/add): Merge conflict in kerberos5/libexec/kdigest/Makefile
Auto-merging kerberos5/libexec/kdigest/Makefile
CONFLICT (add/add): Merge conflict in kerberos5/libexec/kdc/Makefile
Auto-merging kerberos5/libexec/kdc/Makefile
CONFLICT (add/add): Merge conflict in kerberos5/libexec/kcm/Makefile
Auto-merging kerberos5/libexec/kcm/Makefile
CONFLICT (add/add): Merge conflict in kerberos5/libexec/kadmind/Makefile
Auto-merging kerberos5/libexec/kadmind/Makefile
CONFLICT (add/add): Merge conflict in kerberos5/libexec/ipropd-slave/Makefile
Auto-merging kerberos5/libexec/ipropd-slave/Makefile
CONFLICT (add/add): Merge conflict in kerberos5/libexec/ipropd-master/Makefile
Auto-merging kerberos5/libexec/ipropd-master/Makefile
CONFLICT (add/add): Merge conflict in kerberos5/libexec/hpropd/Makefile
Auto-merging kerberos5/libexec/hpropd/Makefile
CONFLICT (add/add): Merge conflict in kerberos5/libexec/hprop/Makefile
Auto-merging kerberos5/libexec/hprop/Makefile
CONFLICT (add/add): Merge conflict in kerberos5/libexec/digest-service/Makefile
Auto-merging kerberos5/libexec/digest-service/Makefile
CONFLICT (add/add): Merge conflict in gnu/usr.bin/grep/Makefile
Auto-merging gnu/usr.bin/grep/Makefile
CONFLICT (add/add): Merge conflict in gnu/usr.bin/gdb/kgdb/Makefile
Auto-merging gnu/usr.bin/gdb/kgdb/Makefile
CONFLICT (add/add): Merge conflict in gnu/usr.bin/gdb/gdb/Makefile
Auto-merging gnu/usr.bin/gdb/gdb/Makefile
CONFLICT (add/add): Merge conflict in gnu/usr.bin/binutils/Makefile.inc0
Auto-merging gnu/usr.bin/binutils/Makefile.inc0
CONFLICT (add/add): Merge conflict in etc/mtree/BSD.usr.dist
Auto-merging etc/mtree/BSD.usr.dist
CONFLICT (add/add): Merge conflict in contrib/telnet/telnet/commands.c
Auto-merging contrib/telnet/telnet/commands.c
CONFLICT (add/add): Merge conflict in contrib/ntp/libntp/libssl_compat.c
Auto-merging contrib/ntp/libntp/libssl_compat.c
CONFLICT (add/add): Merge conflict in contrib/ntp/include/libssl_compat.h
Auto-merging contrib/ntp/include/libssl_compat.h
CONFLICT (add/add): Merge conflict in contrib/llvm-project/compiler-rt/lib/cfi/cfi.cpp
Auto-merging contrib/llvm-project/compiler-rt/lib/cfi/cfi.cpp
CONFLICT (add/add): Merge conflict in contrib/llvm-project/clang/lib/Driver/SanitizerArgs.cpp
Auto-merging contrib/llvm-project/clang/lib/Driver/SanitizerArgs.cpp
CONFLICT (add/add): Merge conflict in contrib/libarchive/libarchive/archive_write_disk_posix.c
Auto-merging contrib/libarchive/libarchive/archive_write_disk_posix.c
CONFLICT (add/add): Merge conflict in contrib/libarchive/libarchive/archive_openssl_evp_private.h
Auto-merging contrib/libarchive/libarchive/archive_openssl_evp_private.h
CONFLICT (add/add): Merge conflict in contrib/less/command.c
Auto-merging contrib/less/command.c
CONFLICT (add/add): Merge conflict in bin/sh/Makefile
Auto-merging bin/sh/Makefile
CONFLICT (add/add): Merge conflict in bin/setfacl/setfacl.c
Auto-merging bin/setfacl/setfacl.c
CONFLICT (add/add): Merge conflict in ObsoleteFiles.inc
Auto-merging ObsoleteFiles.inc
CONFLICT (add/add): Merge conflict in Makefile.libcompat
Auto-merging Makefile.libcompat
CONFLICT (add/add): Merge conflict in Makefile.inc1
Auto-merging Makefile.inc1
CONFLICT (add/add): Merge conflict in Makefile
Auto-merging Makefile
CONFLICT (add/add): Merge conflict in .gitignore
Auto-merging .gitignore
Automatic merge failed; fix conflicts and then commit the result.