summaryrefslogtreecommitdiff
path: root/git-instaweb.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-12-03 13:54:11 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-12-03 13:54:11 -0800
commit99292c638a5c011ce453c904357185d9f6c7dd62 (patch)
tree104fca741d5078b3b41f1ecc38951aa34ef4dcf5 /git-instaweb.sh
parentMerge branch 'jc/maint-am-keep' into maint (diff)
parentbuiltin-merge.c: call exclude_cmds() correctly. (diff)
downloadtgif-99292c638a5c011ce453c904357185d9f6c7dd62.tar.xz
Merge branch 'ap/maint-merge-strategy-list-fix' into maint
* ap/maint-merge-strategy-list-fix: builtin-merge.c: call exclude_cmds() correctly.
Diffstat (limited to 'git-instaweb.sh')
0 files changed, 0 insertions, 0 deletions