diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-07-03 09:52:14 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-07-03 09:52:14 +0400 |
| commit | 5be60078c935ed08ee8eb5a32680bdfb6bb5bdf3 (patch) | |
| tree | 9f68d81a31f8dfe7af6096e7beac2dc0997c143a /git-merge-resolve.sh | |
| parent | 36e5e70e0f40cf7ca4351b8159d68f8560a2805f (diff) | |
Rewrite "git-frotz" to "git frotz"
This uses the remove-dashes target to replace "git-frotz" to "git frotz".
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-resolve.sh')
| -rwxr-xr-x | git-merge-resolve.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-merge-resolve.sh b/git-merge-resolve.sh index 75e1de49ac..bb19da2cc1 100755 --- a/git-merge-resolve.sh +++ b/git-merge-resolve.sh @@ -37,10 +37,10 @@ then exit 2 fi -git-update-index --refresh 2>/dev/null -git-read-tree -u -m --aggressive $bases $head $remotes || exit 2 +git update-index --refresh 2>/dev/null +git read-tree -u -m --aggressive $bases $head $remotes || exit 2 echo "Trying simple merge." -if result_tree=$(git-write-tree 2>/dev/null) +if result_tree=$(git write-tree 2>/dev/null) then exit 0 else |