Commit Diff

Commit:
370cf400336871636b72a1e09da3df3d31c79b8c
From:
Mikhail <mp39590@gmail.com>
Via:
Thomas Adam <thomas@xteddy.org>
Date:
Message:
got merge: call the right usage_*() function Diff from Mikhail, thanks!
Actions:
Patch | Tree
commit - 33da44fec326d6e39487bb31e947ad1256bd4b5c
commit + 370cf400336871636b72a1e09da3df3d31c79b8c
blob - c56e63ad7fc66dd2f713ec26562fc1ed363ed3d8
blob + 86b78a39c45a0ad32b8585b03c72dfebdefda4c0
--- 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 */
 		}
 	}