diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-05-17 14:38:24 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-05-17 14:38:24 -0700 |
commit | 7a7d0854ff3cb1bc5b95e9295b9c11089d9a75a6 (patch) | |
tree | 3dd0b6564f059047113b85e560d9a7d5d5494a67 /git-difftool.perl | |
parent | Merge branch 'bn/config-doc-tt-varnames' (diff) | |
parent | remote.c: specify correct plural form in "commit diverge" message (diff) | |
download | tgif-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