merge-recursive: alphabetize include list
Other than cache.h which needs to appear first, and merge-recursive.h which I want to be second so that we are more likely to notice if merge-recursive.h has any missing includes, the rest of the list is long and easier to look through if it's alphabetical. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Elijah Newren committed
Aug 17, 2019 at 11:41 UTC
4615a8cb5b3a8d4959c30338925b1fa3b948ae52
1 file changed
+17
-16
merge-recursive.c
+17
-16
@@ -4,30 +4,31 @@
4
* The thieves were Alex Riesen and Johannes Schindelin, in June/July 2006
5
*/
6
#include "cache.h"
7
-#include "config.h"
7
+#include "merge-recursive.h"
8
+
9
#include "advice.h"
9
-#include "lockfile.h"
10
-#include "cache-tree.h"
11
-#include "object-store.h"
12
-#include "repository.h"
13
-#include "commit.h"
10
+#include "alloc.h"
11
+#include "attr.h"
12
#include "blob.h"
13
#include "builtin.h"
16
-#include "tree-walk.h"
14
+#include "cache-tree.h"
15
+#include "commit.h"
16
+#include "commit-reach.h"
17
+#include "config.h"
18
#include "diff.h"
19
#include "diffcore.h"
20
+#include "dir.h"
21
+#include "ll-merge.h"
22
+#include "lockfile.h"
23
+#include "object-store.h"
24
+#include "repository.h"
25
+#include "revision.h"
26
+#include "string-list.h"
27
+#include "submodule.h"
28
#include "tag.h"
20
-#include "alloc.h"
29
+#include "tree-walk.h"
30
#include "unpack-trees.h"
22
-#include "string-list.h"
31
#include "xdiff-interface.h"
24
-#include "ll-merge.h"
25
-#include "attr.h"
26
-#include "merge-recursive.h"
27
-#include "dir.h"
28
-#include "submodule.h"
29
-#include "revision.h"
30
-#include "commit-reach.h"
32
33
struct merge_options_internal {
34
int call_depth;