summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-04-11 13:13:49 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-04-11 13:13:49 +0900
commit26e47e261e969491ad4e3b6c298450c061749c9e (patch)
tree62b94be9d536e988afcc35f480d1729c639812e4 /Documentation/git-merge.txt
parentMerge branch 'eb/cred-helper-ignore-sigpipe' (diff)
downloadtgif-26e47e261e969491ad4e3b6c298450c061749c9e.tar.xz
The third batch for 2.18
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions