summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-11-02 11:04:57 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-11-02 11:04:57 +0900
commit9d322282e4a5be1c908d73c8039f99cb9950f8f3 (patch)
tree6dc578f774fe16ed9dff23b5012cf07958f0f4d3 /Documentation/git-merge.txt
parentMerge branch 'jc/rebase-in-c-5-test-typofix' (diff)
parentsequencer: cleanup for gcc warning in non developer mode (diff)
downloadtgif-9d322282e4a5be1c908d73c8039f99cb9950f8f3.tar.xz
Merge branch 'cb/printf-empty-format'
Build fix for a topic in flight. * cb/printf-empty-format: sequencer: cleanup for gcc warning in non developer mode
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions