summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-06-26 15:07:55 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-06-26 15:07:55 -0700
commit0784466657d9d728a37c006ee96fac273ef31dbb (patch)
tree6b834a92ced39b53addc28563522c9ce7e4a881a /Documentation/git-merge.txt
parentMerge branch 'vl/typofix' (diff)
parentuser-manual: Update download size for Git and the kernel (diff)
downloadtgif-0784466657d9d728a37c006ee96fac273ef31dbb.tar.xz
Merge branch 'wk/doc-git-has-grown'
* wk/doc-git-has-grown: user-manual: Update download size for Git and the kernel
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions