summaryrefslogtreecommitdiff
path: root/git-merge-recursive.py
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-07-09 23:49:00 -0700
committerJunio C Hamano <junkio@cox.net>2006-07-09 23:49:00 -0700
commit12d4a97a03ebb4dc64ee995fe33f29076ffa9b39 (patch)
tree7585588e9c22eb060ea659f4d073ec3b0df865e1 /git-merge-recursive.py
parentfc93dbbfc91d5214b03101e057ba16f329763ef9 (diff)
parentb75bf2c3f08b70a3e4850867290a8c215d2c1abf (diff)
downloadgit-12d4a97a03ebb4dc64ee995fe33f29076ffa9b39.tar.gz
Merge branch 'jc/mailinfo'
* jc/mailinfo: mailinfo: assume input is latin-1 on the header as we do for the body
Diffstat (limited to 'git-merge-recursive.py')
0 files changed, 0 insertions, 0 deletions