- typo

Changed files:
    joinpasswd.c -> 1.8

diff --git a/joinpasswd.c b/joinpasswd.c
index 23985076464a4a9b79761be32e53dd44b0f96699..46f41fd62d2f7ffc470e68ee40991b3fbc4aebb4 100644 (file)
--- a/joinpasswd.c
+++ b/joinpasswd.c
@@ -274,7 +274,7 @@ int join(const char *old_name, const char *new_name, const char *backup_name)
        close(fd);
        
 #ifndef SILENT
-       eputs("marging contest of `");
+       eputs("merging contest of `");
        eputs(old_name);
        eputs("' with `");
        eputs(new_name);