aboutsummaryrefslogtreecommitdiffstats
path: root/git-merge-recursive.py
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-12-21 14:00:47 -0800
committerJunio C Hamano <junkio@cox.net>2005-12-21 14:00:47 -0800
commit2a212746f44f18695d33931039da10f842de7b25 (patch)
tree73e3445f380222ecb9d86290ec1118671a866c28 /git-merge-recursive.py
parentPost 1.0.0 development track. (diff)
parentserver-info: skip empty lines. (diff)
downloadgit-2a212746f44f18695d33931039da10f842de7b25.tar.gz
git-2a212746f44f18695d33931039da10f842de7b25.zip
Merge branch 'fixes'
Diffstat (limited to 'git-merge-recursive.py')
0 files changed, 0 insertions, 0 deletions