summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-file.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-07-23 20:55:21 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-07-23 20:55:22 -0700
commit90683976ce83089284ebec3c93aa23d9eb9128a0 (patch)
treeb16f2a32bc9e264efdf98b2b9536404d9682b8ac /Documentation/git-merge-file.txt
parentMerge branch 'tg/ce-namelen-field' (diff)
parentdoc: A few minor copy edits. (diff)
downloadtgif-90683976ce83089284ebec3c93aa23d9eb9128a0.tar.xz
Merge branch 'sn/doc-typofix'
* sn/doc-typofix: doc: A few minor copy edits.
Diffstat (limited to 'Documentation/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions