Merge branch 'dg/local-mod-error-messages'
authorJunio C Hamano <gitster@pobox.com>
Sat, 4 Sep 2010 05:23:49 +0000 (22:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 4 Sep 2010 05:23:49 +0000 (22:23 -0700)
commitc208e05...d9880028c980fafbc5dda3d17a603ac1
tree25d587a...cf885345b2b001bc006ac3871b5c7a4bcopy hash to clipboard (tree)
parentf92d62e...4ead67109418483b65aaf158b7462121copy hash to clipboard (diff)
parentc5978a5...7ca20b12008724f78237784193fb9489copy hash to clipboard (diff)
builtin/checkout.c
builtin/merge.c
merge-recursive.c
merge-recursive.h
unpack-trees.c