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-ours.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-ours.sh')
| -rwxr-xr-x | git-merge-ours.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge-ours.sh b/git-merge-ours.sh index 2b6a5c0d10..c81a790aa6 100755 --- a/git-merge-ours.sh +++ b/git-merge-ours.sh @@ -9,6 +9,6 @@ # because the current index is what we will be committing as the # merge result. -git-diff-index --quiet --cached HEAD || exit 2 +git diff-index --quiet --cached HEAD || exit 2 exit 0 |