Make merge driver complain about older gits

Make merge driver complain about older gits

The git coming with Xcode 7.0 is too old to know about %P. Most
people will be on newer Xcodes (and Trusty's git and depot_tools's
Windows git are new enough), so this doesn't affect most folks -- so
just complaining loudly is good enough.

BUG=574611
TBR=dpranke

Committed: https://chromium.googlesource.com/chromium/tools/depot_tools/+/9bd40a63c45e834e335121123275ec968d73f1c7

[Nico, 2016-10-01 01:32:50]

The CQ bit was checked by thakis@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-10-01 01:33:01]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[dcheng, 2016-10-01 01:35:06]

dcheng@chromium.org changed reviewers:
+ dcheng@chromium.org

[dcheng, 2016-10-01 01:35:06]

Tested locally, LGTM (not an owner though)

[Nico, 2016-10-01 01:35:14]

Description was changed from

==========
Make merge driver complain about older gits

BUG=574611
==========

to

==========
Make merge driver complain about older gits

The git coming with Xcode 7.0 is too old to know about %P. Most
people will be on newer Xcodes (and Trusty's git and depot_tools's
Windows git are new enough), so this doesn't affect most folks -- so
just complaining loudly is good enough.

BUG=574611
==========

[Nico, 2016-10-01 01:35:14]

thakis@chromium.org changed reviewers:
- dcheng@chromium.org

[Nico, 2016-10-01 01:35:42]

Description was changed from

==========
Make merge driver complain about older gits

The git coming with Xcode 7.0 is too old to know about %P. Most
people will be on newer Xcodes (and Trusty's git and depot_tools's
Windows git are new enough), so this doesn't affect most folks -- so
just complaining loudly is good enough.

BUG=574611
==========

to

==========
Make merge driver complain about older gits

The git coming with Xcode 7.0 is too old to know about %P. Most
people will be on newer Xcodes (and Trusty's git and depot_tools's
Windows git are new enough), so this doesn't affect most folks -- so
just complaining loudly is good enough.

BUG=574611
TBR=dpranke
==========

[Nico, 2016-10-01 01:36:08]

thakis@chromium.org changed reviewers:
+ dpranke@chromium.org

[Nico, 2016-10-01 01:36:08]

dpranke: I'll owner-tbr this (blocks reopening the tree)

[commit-bot: I haz the power, 2016-10-01 01:36:10]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-10-01 01:36:11]

Dry run: This issue passed the CQ dry run.

[Nico, 2016-10-01 01:36:17]

The CQ bit was checked by thakis@chromium.org

[commit-bot: I haz the power, 2016-10-01 01:36:21]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-10-01 01:39:17]

Description was changed from

==========
Make merge driver complain about older gits

The git coming with Xcode 7.0 is too old to know about %P. Most
people will be on newer Xcodes (and Trusty's git and depot_tools's
Windows git are new enough), so this doesn't affect most folks -- so
just complaining loudly is good enough.

BUG=574611
TBR=dpranke
==========

to

==========
Make merge driver complain about older gits

The git coming with Xcode 7.0 is too old to know about %P. Most
people will be on newer Xcodes (and Trusty's git and depot_tools's
Windows git are new enough), so this doesn't affect most folks -- so
just complaining loudly is good enough.

BUG=574611
TBR=dpranke

Committed:
https://chromium.googlesource.com/chromium/tools/depot_tools/+/9bd40a63c45e83...
==========

[commit-bot: I haz the power, 2016-10-01 01:39:18]

Committed patchset #1 (id:1) as
https://chromium.googlesource.com/chromium/tools/depot_tools/+/9bd40a63c45e83...

[Dirk Pranke, 2016-10-01 02:27:25]

lgtm