summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-05-22 12:41:47 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-05-22 12:41:47 -0700
commit7928eae1dd971f4411ead609cddc3a71523e031f (patch)
tree3e6a05e062b4e59d365519d448dfec9a15996d67 /Documentation/git-merge.txt
parentMerge branch 'ps/bundle-verify-arg' (diff)
parentcommand-list.txt: fix whitespace inconsistency (diff)
downloadtgif-7928eae1dd971f4411ead609cddc3a71523e031f.tar.xz
Merge branch 'sg/help-subcommands'
A preparatory clean-up step. * sg/help-subcommands: command-list.txt: fix whitespace inconsistency
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions