Skip to content

Commit

Permalink
Merge branch 'pw/p4-update'
Browse files Browse the repository at this point in the history 
* pw/p4-update:
  git-p4: handle files with shell metacharacters
  git-p4: keyword flattening fixes
  git-p4: stop ignoring apple filetype
  git-p4: recognize all p4 filetypes
  git-p4: handle utf16 filetype properly
  git-p4 tests: refactor and cleanup
  • Loading branch information
Junio C Hamano committed Oct 21, 2011
2 parents abe2773 + 6de040d commit 5a4fcc2
Show file tree
Hide file tree
Showing 6 changed files with 919 additions and 423 deletions.
Loading

0 comments on commit 5a4fcc2

Please sign in to comment.