summaryrefslogtreecommitdiff
path: root/git-merge-octopus.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-05-11 11:16:09 -0700
committerJunio C Hamano <gitster@pobox.com>2012-05-11 11:16:09 -0700
commitf5f37461a9d261938ca2bdd9cfcc0da1268f45af (patch)
tree6c94a84b61d877c04a708e060f5acc69009b09f5 /git-merge-octopus.sh
parent51eb3175efc4733ce20a733b7f542b7551a7a961 (diff)
parent2385f24625cda7cc050996d9966e57be2d4d11a3 (diff)
downloadgit-f5f37461a9d261938ca2bdd9cfcc0da1268f45af.tar.gz
Merge branch 'ah/maint-grep-double-init' into maint
By Angus Hammond * ah/maint-grep-double-init: grep.c: remove redundant line of code
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions