Code

Merge branch 'sh/p4'
authorJunio C Hamano <gitster@pobox.com>
Mon, 19 Nov 2007 00:03:58 +0000 (16:03 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 19 Nov 2007 00:03:58 +0000 (16:03 -0800)
commitffa06873d62bba358b51b43def2a0b3aefc790bf
tree727fd84049b057ff2d8a48dd4b601fc249e27619
parent761e8566cb072047e836f1d7f50d3c0f67d7eb00
parent38f9f5ec41803558b4ccefc9db08fac5696aff8d
Merge branch 'sh/p4'

* sh/p4:
  git-p4: Fix direct import from perforce after fetching changes through git from origin