aboutsummaryrefslogtreecommitdiffstats
path: root/builtin/merge-recursive.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-09-01 14:17:32 -0700
committerJunio C Hamano <gitster@pobox.com>2010-09-01 15:11:07 -0700
commitb49c452bb178cbf4dd0d46d88b564e3246b55da2 (patch)
treeed8dadf3240d278e72b693a296dcedcdb6dfe7c5 /builtin/merge-recursive.c
parentMerge branch 'maint' (diff)
downloadgit-b49c452bb178cbf4dd0d46d88b564e3246b55da2.tar.gz
git-b49c452bb178cbf4dd0d46d88b564e3246b55da2.zip
Prepare for 1.7.3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-recursive.c')
0 files changed, 0 insertions, 0 deletions