Merge branch 'ne/maint-1.6.0-diff-tree-t-r-show-directory'
authorJunio C Hamano <gitster@pobox.com>
Thu, 2 Jul 2009 02:40:47 +0000 (19:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 2 Jul 2009 02:40:47 +0000 (19:40 -0700)
* ne/maint-1.6.0-diff-tree-t-r-show-directory:
diff-tree -r -t: include added/removed directories in the output

1  2 
tree-diff.c
diff --cc tree-diff.c
Simple merge