Merge branch 'lt/diff' into next

* lt/diff:
  git diff: support "-U" and "--unified" options properly
  include header to define uint32_t, necessary on Mac OS X

1 files changed, 1 insertions, 0 deletions

diff --git a/diff.h b/diff.h
index d052608404..bef586d850 100644
--- a/diff.h
+++ b/diff.h
@@ -32,6 +32,7 @@ struct diff_options {
 		 full_index:1,
 		 silent_on_remove:1,
 		 find_copies_harder:1;
+	int context;
 	int break_opt;
 	int detect_rename;
 	int line_termination;