summaryrefslogtreecommitdiff
path: root/t/t5100/info0005
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2007-02-16 15:08:46 -0800
committerLibravatar Junio C Hamano <junkio@cox.net>2007-02-16 15:08:46 -0800
commit53756f290b94a0f8ee7021713fa63540d1a7e4e8 (patch)
tree53ba4f90775e57fc7d0eec6d3ef2fbb4dcb7b393 /t/t5100/info0005
parentMerge branch 'maint' (diff)
parentgit-merge: minor fix for no_trivial_merge_strategies. (diff)
downloadtgif-53756f290b94a0f8ee7021713fa63540d1a7e4e8.tar.xz
Merge branch 'maint'
* maint: git-merge: minor fix for no_trivial_merge_strategies.
Diffstat (limited to 't/t5100/info0005')
0 files changed, 0 insertions, 0 deletions