Add a simple script which drives 'kdiff3' through a large source tree
(3 such trees, really). This makes it easy to do 3 way merges of such
trees and easily stop and resume without losing work.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@6312 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/auxprogs/Makefile.am b/auxprogs/Makefile.am
index 5805766..7d54777 100644
--- a/auxprogs/Makefile.am
+++ b/auxprogs/Makefile.am
@@ -3,7 +3,7 @@
bin_PROGRAMS = valgrind-listener
-noinst_SCRIPTS = gen-mdg DotToScc.hs primes.c \
+noinst_SCRIPTS = gen-mdg DotToScc.hs Merge3Way.hs primes.c \
gsl16test gsl16-badfree.patch gsl16-wavelet.patch \
ppcfround.c ppc64shifts.c libmpiwrap.c mpiwrap_type_test.c \
aix5_VKI_info.c libmpiwrap_aix5.exp \