diff options
author | Pete Wyckoff <pw@padd.com> | 2012-01-25 23:48:24 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-01-26 11:35:40 -0800 |
commit | 3558f32f1f5fdb3d566e39f6e07cd3f97d124da6 (patch) | |
tree | 85a2e7dca4a03c0fcf1ed4aa3160d218b1b07dfa /git-merge-resolve.sh | |
parent | git-p4: Add test case for complex branch import (diff) | |
download | tgif-3558f32f1f5fdb3d566e39f6e07cd3f97d124da6.tar.xz |
git-p4: Change p4 command invocation
Change p4 command invocation to avoid going through the shell. This
allows names with spaces and wildcards to work.
Signed-off-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Vitor Antunes <vitor.hda@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions