Clean up different special *HEAD handling

diff --git a/git-pull-script b/git-pull-script
index dbef56c70b7e40c69517c3ede33544d0e9efcc8a..90ee0f322d8c569a5b02b3be1548eb990b4263c9 100755 (executable)
--- 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"