summaryrefslogtreecommitdiff
path: root/userdiff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-02-25 15:40:14 -0800
committerJunio C Hamano <gitster@pobox.com>2015-02-25 15:40:14 -0800
commita75c663cd2056919a58ea949c519aad90eddd2f5 (patch)
tree452a4b9b459c9c8f19e3c39deca2adf95f8b422b /userdiff.c
parent81a535da88617e2ae24b79a9d7413008e0ebc23b (diff)
parent5d308512ffde7efa6b5aad9549320b394b79b740 (diff)
downloadgit-a75c663cd2056919a58ea949c519aad90eddd2f5.tar.gz
Merge branch 'dp/remove-duplicated-header-inclusion'
Code clean-up. * dp/remove-duplicated-header-inclusion: do not include the same header twice
Diffstat (limited to 'userdiff.c')
-rw-r--r--userdiff.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/userdiff.c b/userdiff.c
index fad52d6392..2ccbee50cb 100644
--- a/userdiff.c
+++ b/userdiff.c
@@ -1,6 +1,5 @@
#include "cache.h"
#include "userdiff.h"
-#include "cache.h"
#include "attr.h"
static struct userdiff_driver *drivers;