summaryrefslogtreecommitdiff
path: root/Documentation/merge-strategies.txt
diff options
context:
space:
mode:
authorLibravatar Todd Zullinger <tmz@pobox.com>2018-06-12 23:10:37 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-06-18 08:44:24 -0700
commit94a2bb56b34eaed77a6d21962999716c2104be1a (patch)
tree2aa7f509d4968770760a0d77471932d771aa8563 /Documentation/merge-strategies.txt
parentgit-credential-netrc: remove use of "autodie" (diff)
downloadtgif-94a2bb56b34eaed77a6d21962999716c2104be1a.tar.xz
git-credential-netrc: minor whitespace cleanup in test script
Signed-off-by: Todd Zullinger <tmz@pobox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions