summaryrefslogtreecommitdiff
path: root/Documentation/merge-config.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-04-02 10:13:35 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-04-02 10:13:35 -0700
commit468165c1d8a442994a825f3684528361727cd8c0 (patch)
tree6a54cb7c68d97e863a28478d728c58a1e47f0b4f /Documentation/merge-config.txt
parentMerge tag 'l10n-2.17.0-rnd1' of git://github.com/git-l10n/git-po (diff)
downloadtgif-468165c1d8a442994a825f3684528361727cd8c0.tar.xz
Git 2.17
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-config.txt')
0 files changed, 0 insertions, 0 deletions