summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2007-05-23 22:37:03 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2007-05-23 22:37:03 -0700
commita21f0f0a22c513130f1268e3296dd52d47d2f0e0 (patch)
treea78ea345b2a1976d49b1b50b4bfb9feb9544f187 /git-mergetool.sh
parentMerge branch 'maint-1.5.1' into maint (diff)
parentFix possible coredump with fast-import --import-marks (diff)
downloadtgif-a21f0f0a22c513130f1268e3296dd52d47d2f0e0.tar.xz
Merge branch 'maint' of git://repo.or.cz/git/fastimport into maint
* 'maint' of git://repo.or.cz/git/fastimport: Fix possible coredump with fast-import --import-marks Refactor fast-import branch creation from existing commit fast-import: Fix crash when referencing already existing objects fast-import: Fix uninitialized variable
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions