diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-03-05 13:12:55 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-05 13:12:55 -0800 |
| commit | be2804c49eb19e11578d60218575aca07792bc94 (patch) | |
| tree | 42bd43dded23ee62429b547dc13efb5864166c9c /userdiff.c | |
| parent | 552f6994d2650f5940b98ff52679ee63959027f9 (diff) | |
| parent | 5d308512ffde7efa6b5aad9549320b394b79b740 (diff) | |
| download | git-be2804c49eb19e11578d60218575aca07792bc94.tar.gz git-be2804c49eb19e11578d60218575aca07792bc94.tar.xz | |
Merge branch 'dp/remove-duplicated-header-inclusion' into maint
Code clean-up.
* dp/remove-duplicated-header-inclusion:
do not include the same header twice
Diffstat (limited to 'userdiff.c')
| -rw-r--r-- | userdiff.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/userdiff.c b/userdiff.c index fad52d639..2ccbee50c 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; |