git-merge-tree: generalize the "traverse <n> trees in sync" functionality

[git.git] / git-resolve.sh
diff --git a/git-resolve.sh b/git-resolve.sh

index fcc5ad7349e3f77a6817e499b331b262c4a07b57..926307005493b7c8c4253b1adff34bdb4bc57b77 100755 (executable)
--- a/git-resolve.sh
+++ b/git-resolve.sh
@@ -4,11 +4,9 @@
  #
  # Resolve two trees.
  #
-. git-sh-setup
  
-usage () {
-       die "git-resolve <head> <remote> <merge-message>"
-}
+USAGE='<head> <remote> <merge-message>'
+. git-sh-setup
  
  dropheads() {
         rm -f -- "$GIT_DIR/MERGE_HEAD" \