summaryrefslogtreecommitdiff
path: root/contrib/examples/git-resolve.sh
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/examples/git-resolve.sh')
-rwxr-xr-xcontrib/examples/git-resolve.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/examples/git-resolve.sh b/contrib/examples/git-resolve.sh
index 70fdc27b72..3099dc851a 100755
--- a/contrib/examples/git-resolve.sh
+++ b/contrib/examples/git-resolve.sh
@@ -41,7 +41,7 @@ fi
case "$common" in
"$merge")
- echo "Already up-to-date. Yeeah!"
+ echo "Already up to date. Yeeah!"
dropheads
exit 0
;;