Merge branch 'jk/diff-filespec-cleanup'
authorJunio C Hamano <gitster@pobox.com>
Mon, 27 Jan 2014 18:45:02 +0000 (10:45 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Jan 2014 18:45:03 +0000 (10:45 -0800)
* jk/diff-filespec-cleanup:
  diff_filespec: use only 2 bits for is_binary flag
  diff_filespec: reorder is_binary field
  diff_filespec: drop xfrm_flags field
  diff_filespec: drop funcname_pattern_ident field
  diff_filespec: reorder dirty_submodule macro definitions

1  2 
diff.c

diff --cc diff.c
Simple merge