Code

Merge branch 'jc/maint-add-sync-stat' into maint
authorJunio C Hamano <gitster@pobox.com>
Sun, 25 Nov 2007 02:03:04 +0000 (18:03 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 25 Nov 2007 02:03:04 +0000 (18:03 -0800)
* jc/maint-add-sync-stat:
  t2200: test more cases of "add -u"
  git-add: make the entry stat-clean after re-adding the same contents
  ce_match_stat, run_diff_files: use symbolic constants for readability

1  2 
builtin-add.c
cache.h

diff --cc builtin-add.c
Simple merge
diff --cc cache.h
Simple merge