summaryrefslogtreecommitdiff
path: root/git-mergetool--lib.sh
diff options
context:
space:
mode:
authorRoss Lagerwall <rosslagerwall@gmail.com>2012-08-21 10:21:40 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-08-21 22:27:15 (GMT)
commited36e5bd41f7192e42e9b4c573875a343a9daf48 (patch)
treeb2f2acd049dd5e43d1a5754ba41de65196eb9953 /git-mergetool--lib.sh
parent755e8b3f35e3991a735a6be740eda4567d45a741 (diff)
downloadgit-ed36e5bd41f7192e42e9b4c573875a343a9daf48.zip
git-ed36e5bd41f7192e42e9b4c573875a343a9daf48.tar.gz
git-ed36e5bd41f7192e42e9b4c573875a343a9daf48.tar.bz2
difftool: silence warning
Silence a warning given when running git difftool --dir-diff and there are no changes. This is because command_oneline returns undef when the command has no output, not ''. Signed-off-by: Ross Lagerwall <rosslagerwall@gmail.com> Acked-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions