diff options
Diffstat (limited to 'git-resolve-script')
| -rwxr-xr-x | git-resolve-script | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-resolve-script b/git-resolve-script index 52dd83bae0..4641119e0f 100755 --- a/git-resolve-script +++ b/git-resolve-script @@ -6,8 +6,8 @@ # . git-sh-setup-script || die "Not a git archive" -head=$(git-rev-parse --verify "$1") -merge=$(git-rev-parse --verify "$2") +head=$(git-rev-parse --verify "$1"^0) || exit +merge=$(git-rev-parse --verify "$2"^0) || exit merge_msg="$3" dropheads() { |