Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
l10n: fr.po: Correct case in sentence
[gitweb.git]
/
merge.c
diff --git
a/merge.c
b/merge.c
index fcff632bd63a113ca78b0bd86da1e6af8bc6f7dc..5db7d56b90c3413bbd831f90de73d3306e10ce2f 100644
(file)
--- a/
merge.c
+++ b/
merge.c
@@
-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;
}