commit 02a86be7273724a6513836014ad90f2316ece5df
from: Mikhail <mp39590@gmail.com>
via: Omar Polo <op@omarpolo.com>
date: Mon Jan 23 16:45:04 2023 UTC

got merge: call the right usage_*() function

Diff from Mikhail, thanks!

commit - b8aacf8e5c6c562d8245e7424ccceb7bf666b4ca
commit + 02a86be7273724a6513836014ad90f2316ece5df
blob - cdcbeb71f9090dc6023894262edf4802c8cb907c
blob + 87ce79c90db5ebd79d068d2738dfb439ab4da56a
--- got/got.c
+++ got/got.c
@@ -12280,7 +12280,7 @@ cmd_merge(int argc, char *argv[])
 			interrupt_merge = 1;
 			break;
 		default:
-			usage_rebase();
+			usage_merge();
 			/* NOTREACHED */
 		}
 	}