[pacman-dev] [PATCH 5/5] Add makepkg -G which is like --skipinteg

[Eric Bélanger]

On Tue, Aug 9, 2011 at 6:56 AM, Sebastien Luttringer <seblu at seblu.net> wrote:
> makepkg --skipinteg is a often used to test package and it's the brother of -g option.
> Have a -G shortcut will help to reduce CO².
>
> Signed-off-by: Sebastien Luttringer <seblu at seblu.net>
> ---

> +<<<<<<< HEAD
>                --skipchecksums)  SKIPCHECKSUMS=1 ;;
>                --skipinteg)      SKIPCHECKSUMS=1; SKIPPGPCHECK=1 ;;
>                --skippgpcheck)   SKIPPGPCHECK=1;;
> +=======
> +>>>>>>> Add makepkg -G which is like --skipinteg
>                --sign)           SIGNPKG='y' ;;
>                -s|--syncdeps)    DEP_BIN=1 ;;
>                -S|--source)      SOURCEONLY=1 ;;

The patch seem to be messed up.