summaryrefslogtreecommitdiff
path: root/git-merge-fredrik.py
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2005-09-10 18:37:24 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2005-09-10 19:48:09 -0700
commit53e2cc9b9b104662b9d8a571faea384642df2d66 (patch)
treecab8f84565621833f8ad9b4454e4032f10372a54 /git-merge-fredrik.py
parentAdd a new merge strategy by Fredrik Kuivinen. (diff)
downloadtgif-53e2cc9b9b104662b9d8a571faea384642df2d66.tar.xz
Prepare 0.99.7 release candidate branch.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-fredrik.py')
0 files changed, 0 insertions, 0 deletions