summaryrefslogtreecommitdiff
path: root/mergetools/p4merge
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-10-24 14:59:02 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-10-24 14:59:02 -0700
commitbb8caad3814b49316f842a006082e79b4e46125c (patch)
tree1ec855ef193da60245a1d680e259d9413ebc888e /mergetools/p4merge
parentMerge branch 'tb/core-filemode-doc' (diff)
parentt1304: Set LOGNAME even if USER is unset or null (diff)
downloadtgif-bb8caad3814b49316f842a006082e79b4e46125c.tar.xz
Merge branch 'wk/t1304-wo-USER'
* wk/t1304-wo-USER: t1304: Set LOGNAME even if USER is unset or null
Diffstat (limited to 'mergetools/p4merge')
0 files changed, 0 insertions, 0 deletions