Pete Wyckoff 6bbfd1372d git-p4: add submit --conflict option and config varaiable ...

This allows specifying what to do when a conflict
happens when applying a commit to p4, automating the
interactive prompt.

Signed-off-by: Pete Wyckoff <pw@padd.com>
Acked-by: Luke Diamand <luke@diamand.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2012-09-16 21:52:53 -07:00

18 KiB

Raw Blame History

View Raw