Merge branch 'as/test-name-alias-uniquely'
authorJunio C Hamano <gitster@pobox.com>
Tue, 8 Jan 2013 21:23:21 +0000 (13:23 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 Jan 2013 21:23:22 +0000 (13:23 -0800)
commit8d1b1a02493072aeb11fa8d6d27759a917e7aad5
tree7741940cd2c8425ecac85865711016ce28a3cba2
parentf4de0de8d58144e4563b5a42d10e894832bf0c8c
parentd16ece20112c9418916bca87bbed0ff68b2169e9
Merge branch 'as/test-name-alias-uniquely'

A few short-and-bland aliases used in the tests were interfering
with git-custom command in user's $PATH.

* as/test-name-alias-uniquely:
  Use longer alias names in subdirectory tests