summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-04-07 02:20:47 -0700
committerJunio C Hamano <junkio@cox.net>2007-04-07 02:20:47 -0700
commit39415449ee9b0bfbd6026e38c6e5d43f99759bf2 (patch)
treea571dd21ff570a22ed7386fc8070ab8eacf1af4a /merge-recursive.c
parent5bba1b355ec505407dc7aef56dd0c94f60760f1a (diff)
parent3b486cd229f1db437462a45103ef01d50c47a00d (diff)
downloadgit-39415449ee9b0bfbd6026e38c6e5d43f99759bf2.tar.gz
Merge branch 'fp/make-j'
* fp/make-j: Makefile: Add '+' to QUIET_SUBDIR0 to fix parallel make.
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions