summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-file.txt
diff options
context:
space:
mode:
authorLibravatar Sebastian Morr <sebastian@morr.cc>2011-12-02 23:55:28 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-12-05 14:42:40 -0800
commit332de7a1c89a579f15ca41c11e606007cc32fdbf (patch)
tree1abca7249658a0db076a4ed7db05e3980641e45a /Documentation/git-merge-file.txt
parentMerge branch 'mh/maint-notes-merge-pathbuf-fix' into maint-1.7.6 (diff)
downloadtgif-332de7a1c89a579f15ca41c11e606007cc32fdbf.tar.xz
Add MYMETA.yml to perl/.gitignore
This file is auto-generated by newer versions of ExtUtils::MakeMaker (presumably starting with the version shipping with Perl 5.14). It just contains extra information about the environment and arguments to the Makefile-building process, and should be ignored. Signed-off-by: Sebastian Morr <sebastian@morr.cc> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions