summaryrefslogtreecommitdiff
path: root/contrib/examples/git-pull.sh
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/examples/git-pull.sh')
-rwxr-xr-xcontrib/examples/git-pull.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/examples/git-pull.sh b/contrib/examples/git-pull.sh
index e8dc2e0e7d..6b3a03f9b0 100755
--- a/contrib/examples/git-pull.sh
+++ b/contrib/examples/git-pull.sh
@@ -69,7 +69,7 @@ as appropriate to mark resolution and make a commit.")"
die_merge () {
if [ $(git config --bool --get advice.resolveConflict || echo true) = "true" ]; then
die "$(gettext "You have not concluded your merge (MERGE_HEAD exists).
-Please, commit your changes before you can merge.")"
+Please, commit your changes before merging.")"
else
die "$(gettext "You have not concluded your merge (MERGE_HEAD exists).")"
fi