summaryrefslogtreecommitdiff
path: root/t/t5515-fetch-merge-logic.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-03-04 22:24:19 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-03-04 22:24:19 -0800
commite8a285e553f8c6c04820a542b2a28816a9d62d3c (patch)
treeaf3b7f1a10cae9c470ae77f3fde00979f2969a7a /t/t5515-fetch-merge-logic.sh
parentt3301-notes: insert a shbang line in ./fake_editor.sh (diff)
parentRemove extra '-' from git-am(1) (diff)
downloadtgif-e8a285e553f8c6c04820a542b2a28816a9d62d3c.tar.xz
Merge branch 'maint-1.6.5' into maint-1.6.6
* maint-1.6.5: Remove extra '-' from git-am(1)
Diffstat (limited to 't/t5515-fetch-merge-logic.sh')
0 files changed, 0 insertions, 0 deletions