Home
last modified time | relevance | path

Searched refs:clmerge (Results 1 – 7 of 7) sorted by relevance

/netbsd-src/external/gpl2/xcvs/dist/contrib/
H A DMakefile.in56 $(srcdir)/clmerge.in $(srcdir)/cln_hist.in \
127 CONFIG_CLEAN_FILES = validate_repo clmerge cln_hist commit_prep \
319 clmerge \
405 clmerge: $(top_builddir)/config.status $(srcdir)/clmerge.in
H A DMakefile.am25 clmerge \ script
H A DChangeLog67 * clmerge.in, cln_hist.in, commit_prep.in, cvs2vendor.sh, cvs_acls.in,
74 * clmerge.in, cln_hist.in, commit_prep.in, cvs2vendor.sh, cvs_acls.in,
621 * contrib/clmerge.in: Rename from clmerge.pl
631 * contrib/clmerge.pl: Rename to clmerge.in
979 * clmerge.pl, cvscheck.sh, descend.sh, dirfns.shar, rcs-to-cvs.sh,
1008 * rcslock.pl, mfpipe.pl, cvs_acls.pl, cln_hist.pl, clmerge.pl:
1045 * clmerge: Changes from Tom Tromey --- fix bug in date comparison
H A DREADME27 clmerge A perl script to handle merge conflicts in GNU
/netbsd-src/external/gpl2/xcvs/dist/
H A Dconfigure.in1556 AC_CONFIG_FILES(contrib/clmerge, [chmod +x contrib/clmerge])
H A Dconfigure19176 "contrib/clmerge") CONFIG_FILES="$CONFIG_FILES contrib/clmerge" ;;
19921 "contrib/clmerge":F) chmod +x contrib/clmerge ;;
H A DChangeLog3972 * contrib/clmerge.in: Rename from clmerge.pl
3983 * contrib/clmerge.pl: Rename to clmerge.in