summaryrefslogtreecommitdiffstats
path: root/git-merge-recursive.py
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-11-09 18:44:18 -0800
committerJunio C Hamano <junkio@cox.net>2005-11-09 18:44:18 -0800
commit68afd5fab777a3c27e205d33c2379d8af6c7749f (patch)
treea8acb5da3eb1beebddf33324de0b358bfe826db7 /git-merge-recursive.py
parentgit-apply: do not fail on binary diff when not applying nor checking. (diff)
parentSeparate RPMS for programs with non-standard dependencies. (diff)
downloadgit-68afd5fab777a3c27e205d33c2379d8af6c7749f.tar.gz
git-68afd5fab777a3c27e205d33c2379d8af6c7749f.zip
Merge branch 'hold/rpm'
Diffstat (limited to 'git-merge-recursive.py')
0 files changed, 0 insertions, 0 deletions