am: suppress apply errors when using 3-way

diff --git a/git-relink.perl b/git-relink.perl
index 15fb932021e03e2b7b856b3a2285021be2ebac61..937c69a74858a8a3c63bb41a23705b579df1b3a3 100755 (executable)
--- a/git-relink.perl
+++ b/git-relink.perl
@@ -163,7 +163,7 @@ ($$)
 
 
 sub usage() {
-       print("Usage: $0 [--safe] <dir> [<dir> ...] <master_dir> \n");
+       print("Usage: git relink [--safe] <dir> [<dir> ...] <master_dir> \n");
        print("All directories should contain a .git/objects/ subdirectory.\n");
        print("Options\n");
        print("\t--safe\t" .