summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool--lib.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-03-01 14:02:42 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-03-01 14:02:58 -0800
commitec125d1bc1053df7e4103f71ebd24fe48dd624a2 (patch)
treed8c34c422aa144be313f744190f1f877209b060f /Documentation/git-mergetool--lib.txt
parentMerge branch 'jh/untracked-cache-fix' (diff)
downloadtgif-ec125d1bc1053df7e4103f71ebd24fe48dd624a2.tar.xz
Hopefully the last batch before -rc1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-mergetool--lib.txt')
0 files changed, 0 insertions, 0 deletions