summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorLibravatar Philip Oakley <philipoakley@iee.org>2014-10-10 22:25:36 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-10-10 15:59:41 -0700
commit5a568ea05094da4507170ff91fc528a0113dc8be (patch)
tree0dd2012217d59174388e46576f6698db3b3e97ee /Documentation/git-merge.txt
parentdoc: modernise everyday.txt wording and format in man page style (diff)
downloadtgif-5a568ea05094da4507170ff91fc528a0113dc8be.tar.xz
doc: Makefile regularise OBSOLETE_HTML list building
Helped-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions