summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool--lib.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-04-21 12:58:50 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-04-21 12:58:50 -0700
commitfb896362cc12dfc0df69be6c9d75936f9c7cc7ff (patch)
tree034f62b74842d30dfa77a98617de4ee7d142a3fc /Documentation/git-mergetool--lib.txt
parentRelNotes: "merge --quiet" change has been reverted (diff)
parentGit 2.3.6 (diff)
downloadtgif-fb896362cc12dfc0df69be6c9d75936f9c7cc7ff.tar.xz
Sync with maint
Diffstat (limited to 'Documentation/git-mergetool--lib.txt')
0 files changed, 0 insertions, 0 deletions