tree 5ee634beb4b95fba3ce7d45b4259898d6d908464
parent 71957339da64100db4114106bbba4e9c5bcf8f86
parent 1f90a64891ed83e172cbf605890044dba8315073
author Junio C Hamano <gitster@pobox.com> 1451339937 -0800
committer Junio C Hamano <gitster@pobox.com> 1451339938 -0800

Merge branch 'sh/p4-multi-depot'

"git p4" when interacting with multiple depots at the same time
used to incorrectly drop changes.

* sh/p4-multi-depot:
  git-p4: reduce number of server queries for fetches
  git-p4: support multiple depot paths in p4 submit
  git-p4: failing test case for skipping changes with multiple depots