Merge branch 'jc/fake-ancestor-with-non-blobs' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 7 Feb 2013 23:14:22 +0000 (15:14 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 7 Feb 2013 23:14:22 +0000 (15:14 -0800)
commit427c6d0...af0caee5ad2c4925910a6b8ebcf95408
treeea73fd9...5a86866dfb95976b13f2e1cda00bbd67copy hash to clipboard (tree)
parent45bb6cb...49699a64196ed866c4809cd8267bd481copy hash to clipboard (diff)
parente28efb1...98bb0b73057de13b9568f6aef439a583copy hash to clipboard (diff)
builtin/apply.c
git-am.sh