summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-file.txt
diff options
context:
space:
mode:
authorLibravatar Michael Haggerty <mhagger@alum.mit.edu>2011-08-04 06:36:12 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-08-04 15:53:15 -0700
commit650cfc512e189c1af347c9eeaebc0377e0dcb88d (patch)
treea591010bb9bfda24cc50bb528a53523ac9ce4f4d /Documentation/git-merge-file.txt
parentdoc: Add a link from gitattributes(5) to git-check-attr(1) (diff)
downloadtgif-650cfc512e189c1af347c9eeaebc0377e0dcb88d.tar.xz
doc: Correct git_attr() calls in example code
Commit 7fb0eaa2 (2010-01-17) changed git_attr() to take a string instead of a string and a length. Update the documentation accordingly. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions