Merge branch 'nd/const-struct-cache-entry'
authorJunio C Hamano <gitster@pobox.com>
Mon, 22 Jul 2013 18:24:00 +0000 (22 11:24 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 22 Jul 2013 18:24:01 +0000 (22 11:24 -0700)
* nd/const-struct-cache-entry:
  Convert "struct cache_entry *" to "const ..." wherever possible

1  2 
builtin/apply.c
builtin/checkout.c
builtin/commit.c
builtin/merge.c
cache.h
diff.c
dir.c
entry.c
sha1_name.c
submodule.c
wt-status.c

diff --cc builtin/apply.c
Simple merge
Simple merge
Simple merge
diff --cc builtin/merge.c
Simple merge
diff --cc cache.h
Simple merge
diff --cc diff.c
Simple merge
diff --cc dir.c
Simple merge
diff --cc entry.c
Simple merge
diff --cc sha1_name.c
Simple merge
diff --cc submodule.c
Simple merge
diff --cc wt-status.c
Simple merge