summaryrefslogtreecommitdiff
path: root/Documentation/merge-strategies.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-07-30 15:00:04 -0700
committerJunio C Hamano <gitster@pobox.com>2017-07-30 15:00:04 -0700
commit0bfff8146f8c055fd95af4567286929ba8216fa7 (patch)
tree6ec3fd4429de46f1f4eec745119b1335843d70f5 /Documentation/merge-strategies.txt
parentd78f06a1b70f3743899b5494f55a456596e51a63 (diff)
downloadgit-0bfff8146f8c055fd95af4567286929ba8216fa7.tar.gz
Git 2.10.4v2.10.4
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions