Merge branch 'bk/refresh-missing-ok-in-merge-recursive'
authorJunio C Hamano <gitster@pobox.com>
Thu, 27 Feb 2014 22:01:14 +0000 (14:01 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 27 Feb 2014 22:01:14 +0000 (14:01 -0800)
commit156d6ed...221ff38c4cd3bfcfc6778e31c104fd9b
treed1e4e06...6b9f304bc1ce2deacd555183131d2be1copy hash to clipboard (tree)
parent7da5fd6...95af9066ad4684e333c57f4086589c2fcopy hash to clipboard (diff)
parent6e2068a...48000a2dfdb2044bbb91073c11f6fbffcopy hash to clipboard (diff)
cache.h
merge-recursive.c
read-cache.c