summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-04-22 13:52:43 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-04-22 13:52:43 -0700
commit564705c7f0938107f372cc1aa3a54689f30473bf (patch)
treea977817c02b1bce03a64e8ac7fbb837084535487 /Documentation/merge-options.txt
parentSync with maint (diff)
downloadtgif-564705c7f0938107f372cc1aa3a54689f30473bf.tar.xz
Git 2.4.0-rc3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-options.txt')
0 files changed, 0 insertions, 0 deletions