Merge branch 'js/diff-verbose-submodule'
authorJunio C Hamano <gitster@pobox.com>
Sat, 31 Oct 2009 03:16:26 +0000 (30 20:16 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 31 Oct 2009 03:16:26 +0000 (30 20:16 -0700)
* js/diff-verbose-submodule:
  add tests for git diff --submodule
  Add the --submodule option to the diff option family

1  2 
Makefile
diff.c

diff --cc Makefile
Simple merge
diff --cc diff.c
Simple merge