merge-one-file: use common as base, instead of emptiness.
authorJunio C Hamano <junkio@cox.net>
Thu, 10 Nov 2005 04:38:33 +0000 (20:38 -0800)
committerJunio C Hamano <junkio@cox.net>
Sat, 12 Nov 2005 05:18:17 +0000 (21:18 -0800)
commitcb93c19...65760d939f05d9a3c2ef4499f0d5ce16
tree7427fa1...25c61e2d647d8cbf314289d0616d021ccopy hash to clipboard (tree)
parentf7d24bb...fb06c40f7738f471dda561ab45496d24copy hash to clipboard (diff)
apply.c
git-merge-one-file.sh