Merge branch 'bb/diff-no-index-dotdot'
commit37943cc6b9a24c1636472f670aba972d12757ba7
authorJunio C Hamano <gitster@pobox.com>
Tue, 25 Mar 2014 18:08:31 +0000 (25 11:08 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 25 Mar 2014 18:08:31 +0000 (25 11:08 -0700)
tree7e52f64288997760f6a8ebc93d79cd13ca3cfd46
parentcf30bfb8fb9e749637a73685a8de9600ab1fbe5f
parentfd3aeeab0d41474af86e41d207196abbb7bf78f6
Merge branch 'bb/diff-no-index-dotdot'

* bb/diff-no-index-dotdot:
  diff-no-index: replace manual "."/".." check with is_dot_or_dotdot()
  diff-no-index: rename read_directory()
diff-no-index.c