diff options
Diffstat (limited to 'git-resolve.sh')
| -rwxr-xr-x | git-resolve.sh | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/git-resolve.sh b/git-resolve.sh index fcc5ad7349..9263070054 100755 --- 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" \ |