aboutsummaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-05-21 04:02:17 -0700
committerJunio C Hamano <gitster@pobox.com>2010-05-21 04:02:17 -0700
commit455bda993cceb42921c9ff173da26651f1d66602 (patch)
tree4e3fd6c8f85e1dbb70d8ea6356b569b0bb9c7e80 /git-mergetool.sh
parent1bdd46cd3a2fe1e0aeb965fb0edb493064e24495 (diff)
parentbb15e38281aab342a0e3ca7d5663b0c3f9d5e72e (diff)
downloadgit-455bda993cceb42921c9ff173da26651f1d66602.tar.gz
git-455bda993cceb42921c9ff173da26651f1d66602.tar.xz
Merge branch 'cw/maint-exec-defpath'
* cw/maint-exec-defpath: autoconf: Check if <paths.h> exists and set HAVE_PATHS_H exec_cmd.c: replace hard-coded path list with one from <paths.h>
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions