]> granicus.if.org Git - git/commitdiff
Merge branch 'ks/p4-view-spec'
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 Sep 2013 18:44:50 +0000 (11:44 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Sep 2013 18:44:50 +0000 (11:44 -0700)
* ks/p4-view-spec:
  git p4: implement view spec wildcards with "p4 where"
  git p4 test: sanitize P4CHARSET

1  2 
git-p4.py

diff --cc git-p4.py
Simple merge