Merge branch 'ls/p4-retry-thrice'

* ls/p4-retry-thrice:
git-p4: add config to retry p4 commands; retry 3 times by default

diff --cc Documentation/git-p4.txt
Simple merge

diff --cc git-p4.py
Simple merge