summaryrefslogtreecommitdiff
path: root/git-difftool.perl
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-05-17 14:38:24 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-05-17 14:38:24 -0700
commit7a7d0854ff3cb1bc5b95e9295b9c11089d9a75a6 (patch)
tree3dd0b6564f059047113b85e560d9a7d5d5494a67 /git-difftool.perl
parentMerge branch 'bn/config-doc-tt-varnames' (diff)
parentremote.c: specify correct plural form in "commit diverge" message (diff)
downloadtgif-7a7d0854ff3cb1bc5b95e9295b9c11089d9a75a6.tar.xz
Merge branch 'nd/remote-plural-ours-plus-theirs'
Message fix. * nd/remote-plural-ours-plus-theirs: remote.c: specify correct plural form in "commit diverge" message
Diffstat (limited to 'git-difftool.perl')
0 files changed, 0 insertions, 0 deletions