| #!/bin/sh | |
| # | |
| merge_repo=$1 | |
| merge_name=${2:-HEAD} | |
| : ${GIT_DIR=.git} | |
| : ${GIT_OBJECT_DIRECTORY="${SHA1_FILE_DIRECTORY-"$GIT_DIR/objects"}"} | |
| git-fetch-script "$merge_repo" "$merge_name" | |
| git-resolve-script \ | |
| "$(cat "$GIT_DIR"/HEAD)" \ | |
| "$(cat "$GIT_DIR"/MERGE_HEAD)" \ | |
| "$merge_repo" |