summaryrefslogtreecommitdiffstats
path: root/builtin-repo-config.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-10-23 09:36:22 +0200
committerJunio C Hamano <junkio@cox.net>2006-10-28 02:16:40 +0200
commit9926ba98a4a77e012ea9121abee42608fe1564b6 (patch)
treebcb37631fc65f96f7e095ded96860411909f17d8 /builtin-repo-config.c
parentmerge: loosen overcautious "working file will be lost" check. (diff)
downloadgit-9926ba98a4a77e012ea9121abee42608fe1564b6.tar.xz
git-9926ba98a4a77e012ea9121abee42608fe1564b6.zip
merge-recursive: use abbreviated commit object name.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-repo-config.c')
0 files changed, 0 insertions, 0 deletions