# apostrophes to be ASCII so that cut&pasting examples to the shell
# will work.
#
+ # Define PERL_PATH to the path of your Perl binary (usually /usr/bin/perl).
+ #
# Define NO_PERL_MAKEMAKER if you cannot use Makefiles generated by perl's
# MakeMaker (e.g. using ActiveState under Cygwin).
#
# Define NO_PERL if you do not want Perl scripts or libraries at all.
#
+ # Define PYTHON_PATH to the path of your Python binary (often /usr/bin/python
+ # but /usr/bin/python2.7 on some platforms).
+ #
# Define NO_PYTHON if you do not want Python scripts or libraries at all.
#
# Define NO_TCLTK if you do not want Tcl/Tk GUI.
LIB_H += ll-merge.h
LIB_H += log-tree.h
LIB_H += mailmap.h
-LIB_H += merge-file.h
+LIB_H += merge-blobs.h
LIB_H += merge-recursive.h
LIB_H += mergesort.h
LIB_H += notes-cache.h