Redo "revert" using three-way merge machinery.

diff --git a/Makefile b/Makefile
index c0fdaa701f973ec84a9c4524af451432ee2adcf0..13ad6d89ee9703cfff962215ef4e6604f9a70afd 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -215,6 +215,7 @@ check:
 install: $(PROG) $(SCRIPTS)
        $(INSTALL) -m755 -d $(DESTDIR)$(bindir)
        $(INSTALL) $(PROG) $(SCRIPTS) $(DESTDIR)$(bindir)
+       $(INSTALL) git-revert-script $(DESTDIR)$(bindir)/git-cherry-pick-script
        $(MAKE) -C templates install
        $(MAKE) -C tools install