diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2013-05-02 14:58:40 -0500 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2013-05-02 14:58:40 -0500 |
| commit | 4e7c15608f427466ef941cad45b27f1ad30bd25a (patch) | |
| tree | 0dbafbe9580d7d3ae51f30b8c9789afad7504b15 /tests-clar/merge/merge_helpers.h | |
| parent | af7689ea2489b2e92d46086a689ec074dd0854f5 (diff) | |
| download | libgit2-4e7c15608f427466ef941cad45b27f1ad30bd25a.tar.gz | |
puns are not funny; type punning especially so
Diffstat (limited to 'tests-clar/merge/merge_helpers.h')
| -rw-r--r-- | tests-clar/merge/merge_helpers.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/tests-clar/merge/merge_helpers.h b/tests-clar/merge/merge_helpers.h index 1a0b8921b..cb718e01a 100644 --- a/tests-clar/merge/merge_helpers.h +++ b/tests-clar/merge/merge_helpers.h @@ -18,11 +18,8 @@ struct merge_name_entry { }; struct merge_index_with_status { - uint16_t mode; - char oid_str[41]; - int stage; - char path[128]; - unsigned int status; + struct merge_index_entry entry; + unsigned int status; }; struct merge_reuc_entry { |