summaryrefslogtreecommitdiff
path: root/utf8.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-06-24 19:21:45 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-06-24 19:21:45 (GMT)
commit4b64c8a1eea6b44fb8505ec46cccf8255c7e6c63 (patch)
tree09b7be5b4670d10c27896b27561382c4dbe73f6f /utf8.h
parent49ac7358da163b0f8a32ce71723b2071f962d3fd (diff)
parentd96a275b91bae1800cd43be0651e886e7e042a17 (diff)
downloadgit-4b64c8a1eea6b44fb8505ec46cccf8255c7e6c63.zip
git-4b64c8a1eea6b44fb8505ec46cccf8255c7e6c63.tar.gz
git-4b64c8a1eea6b44fb8505ec46cccf8255c7e6c63.tar.bz2
Merge branch 'rl/am-3way-config'
"git am" learned am.threeWay configuration variable. * rl/am-3way-config: git-am: add am.threeWay config variable t4150-am: refactor am -3 tests git-am.sh: fix initialization of the threeway variable
Diffstat (limited to 'utf8.h')
0 files changed, 0 insertions, 0 deletions