aboutsummaryrefslogtreecommitdiff
path: root/merge-file.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-08-27 20:03:35 -0700
committerJunio C Hamano <gitster@pobox.com>2009-08-27 20:03:35 -0700
commita1eb73d917e15cd97314e0a39cbe857329339a96 (patch)
tree731da0e1a6330782aa22c5dfda3543be1f99fefb /merge-file.c
parent262b04fa8dce84596738fd8c0dbff52994388efa (diff)
parentafce435000030e3ad076ef1dd413e0fa314cdcbb (diff)
downloadgit-a1eb73d917e15cd97314e0a39cbe857329339a96.tar.gz
git-a1eb73d917e15cd97314e0a39cbe857329339a96.tar.xz
Merge branch 'maint-1.5.6' into maint-1.6.0
* maint-1.5.6: revision traversal and pack: notice and die on missing commit
Diffstat (limited to 'merge-file.c')
0 files changed, 0 insertions, 0 deletions