diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-10-14 10:49:00 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-10-14 10:49:01 -0700 |
| commit | 211836f77bc85eafe5c24fcbd70cd7583ce68328 (patch) | |
| tree | 959262c218c429557e5412b38e323836489d11a3 /merge-recursive.c | |
| parent | 63a45136a329bab550425c3142db6071434d935e (diff) | |
| parent | 1c4b6604126781361fe89d88ace70f53079fbab5 (diff) | |
| download | git-211836f77bc85eafe5c24fcbd70cd7583ce68328.tar.gz git-211836f77bc85eafe5c24fcbd70cd7583ce68328.tar.xz | |
Merge branch 'da/include-compat-util-first-in-c'
Code clean-up.
* da/include-compat-util-first-in-c:
cleanups: ensure that git-compat-util.h is included first
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 8ad4be897..9fc71a239 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -3,8 +3,8 @@ * Fredrik Kuivinen. * The thieves were Alex Riesen and Johannes Schindelin, in June/July 2006 */ -#include "advice.h" #include "cache.h" +#include "advice.h" #include "cache-tree.h" #include "commit.h" #include "blob.h" |