diff options
| author |  Pete Wyckoff <pw@padd.com> | 2011-12-24 21:07:35 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-12-27 10:19:30 -0800 |
| commit | 58c8bc7c1aa0c7cf71c524cc4531a19ef72ea706 (patch) | |
| tree | ceb5533550546e2bd5774fc82b44ce26865d7c9f /t/t7606-merge-custom.sh | |
| parent | git-p4: document and test clone --branch (diff) | |
| download | tgif-58c8bc7c1aa0c7cf71c524cc4531a19ef72ea706.tar.xz | |
git-p4: honor --changesfile option and test
When an explicit list of changes is given, it makes no sense to
use @all or @3,5 or any of the other p4 revision specifiers.
Make the code notice when this happens, instead of just ignoring
--changesfile. Test it.
Signed-off-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7606-merge-custom.sh')
0 files changed, 0 insertions, 0 deletions