diff options
Diffstat (limited to 'git-pull-script')
| -rwxr-xr-x | git-pull-script | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-pull-script b/git-pull-script index dbef56c70b..90ee0f322d 100755 --- a/git-pull-script +++ b/git-pull-script @@ -17,5 +17,5 @@ git-fetch-script "$merge_repo" "$merge_head" || exit 1 git-resolve-script \ "$(cat "$GIT_DIR"/HEAD)" \ - "$(cat "$GIT_DIR"/MERGE_HEAD)" \ + "$(cat "$GIT_DIR"/FETCH_HEAD)" \ "$merge_name" |