Merge branch 'jk/diff-filespec-cleanup'
commite049109ef11be4e164c6f0426fb77c9c7a1ab647
authorJunio C Hamano <gitster@pobox.com>
Mon, 27 Jan 2014 18:45:02 +0000 (27 10:45 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Jan 2014 18:45:03 +0000 (27 10:45 -0800)
tree9dac08e47724ecfe383331b49685c707aa4e2453
parent7b4e2b7e6aba677fcefffde79d0d3a53ae623b4f
parentcbfe47b67fc1072998c73e6d43cf6ad061a436f5
Merge branch 'jk/diff-filespec-cleanup'

* 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
diff.c