diff options
Diffstat (limited to 'merge.c')
-rw-r--r-- | merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -10,7 +10,7 @@ static const char *merge_argument(struct commit *commit) { if (commit) - return sha1_to_hex(commit->object.sha1); + return oid_to_hex(&commit->object.oid); else return EMPTY_TREE_SHA1_HEX; } |