INSTALL: git-merge no longer uses cpio

Since a64d7784e830b3140e7d0f2b45cb3d8fafb84cca git merge doesn't use cpio
anymore, adapt the documentation.

Signed-off-by: Gerrit Pape <pape@smarden.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/INSTALL b/INSTALL
index f1eb4049b9f839c1b3d1aa5a4d7387d0e93f0f5c..6f3bcb45253367e0bf7fc8e43e45ccb404b23824 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -79,8 +79,8 @@ Issues of note:
        - "perl" and POSIX-compliant shells are needed to use most of
          the barebone Porcelainish scripts.
 
        - "perl" and POSIX-compliant shells are needed to use most of
          the barebone Porcelainish scripts.
 

-       - "cpio" is used by git-merge for saving and restoring the index,
-         and by git-clone when doing a local (possibly hardlinked) clone.
+       - "cpio" is used by git-clone when doing a local (possibly
+         hardlinked) clone.

 
  - Some platform specific issues are dealt with Makefile rules,
    but depending on your specific installation, you may not
 
  - Some platform specific issues are dealt with Makefile rules,
    but depending on your specific installation, you may not