summaryrefslogtreecommitdiff
path: root/tests/checkout/conflict.c
diff options
context:
space:
mode:
authorVicent Marti <vicent@github.com>2014-09-17 17:13:25 +0200
committerVicent Marti <vicent@github.com>2014-09-17 17:13:25 +0200
commit14556cbff7d8728d1dfed3b6decd097c87132387 (patch)
tree76a4a36a765b6c6305f53d42c42abb5fed228893 /tests/checkout/conflict.c
parent6340e8f5d0a54fab2ef9292e6c1e1a2e62b17310 (diff)
parent3b2cb2c91ee77e5e45957e8355025e3e742c07bd (diff)
downloadlibgit2-14556cbff7d8728d1dfed3b6decd097c87132387.tar.gz
Merge pull request #2567 from cirosantilli/factor-41
Factor 40 and 41 constants from source.
Diffstat (limited to 'tests/checkout/conflict.c')
-rw-r--r--tests/checkout/conflict.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/checkout/conflict.c b/tests/checkout/conflict.c
index 721c3901e..3d763af12 100644
--- a/tests/checkout/conflict.c
+++ b/tests/checkout/conflict.c
@@ -48,7 +48,7 @@ static git_index *g_index;
struct checkout_index_entry {
uint16_t mode;
- char oid_str[41];
+ char oid_str[GIT_OID_HEXSZ+1];
int stage;
char path[128];
};