diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-11-25 16:35:20 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-25 16:35:20 -0800 |
| commit | 93dcab2937624ebb97f91807576cddb242a55a46 (patch) | |
| tree | 8d16464f16866a7f215401a95f8bdaa124799d49 /git-resolve.sh | |
| parent | 52b6536c624b4998b3730b55b9bc3d7c4e1071a4 (diff) | |
| parent | 2a1ddc58e4d2220feea7eba4623dac07a0f83f94 (diff) | |
| download | git-93dcab2937624ebb97f91807576cddb242a55a46.tar.gz git-93dcab2937624ebb97f91807576cddb242a55a46.tar.xz | |
GIT 0.99.9kv0.99.9k
This is not 1.0rc4 yet, but to push the recent fixes out.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-resolve.sh')
| -rwxr-xr-x | git-resolve.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-resolve.sh b/git-resolve.sh index 7d8fb54f9..fcc5ad734 100755 --- a/git-resolve.sh +++ b/git-resolve.sh @@ -4,7 +4,7 @@ # # Resolve two trees. # -. git-sh-setup || die "Not a git archive" +. git-sh-setup usage () { die "git-resolve <head> <remote> <merge-message>" |