summaryrefslogtreecommitdiff
path: root/merge-tree.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2007-11-24 18:03:04 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2007-11-24 18:03:04 -0800
commitbc2b8eafaf074492e0489974b4086b3a0f354e7e (patch)
treea5662a57c224c50309019386707eb95206248191 /merge-tree.c
parentMerge branch 'jc/maint-format-patch-encoding' into maint (diff)
parentt2200: test more cases of "add -u" (diff)
downloadtgif-bc2b8eafaf074492e0489974b4086b3a0f354e7e.tar.xz
Merge branch 'jc/maint-add-sync-stat' into maint
* 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
Diffstat (limited to 'merge-tree.c')
0 files changed, 0 insertions, 0 deletions