smartarray / unmerge-conflicts Goto Github PK

Help Screen

$ unmerge.pl [options] {conflict file}

OPTIONS
--help, -h      Show this help screen.

DESCRIPTION
unmerge.pl splits a file containing merge conflict markers into two files.

Given a file named sandwich.txt that looks like this:

    Top piece of bread
    Mayonnaise
    Lettuce
    Tomato
    Provolone
    <<<<<<< .mine
    Salami
    Mortadella
    Prosciutto
    =======
    Sauerkraut
    Grilled Chicken
    >>>>>>> .r2
    Creole Mustard
    Bottom piece of bread

The result of unmerge.pl will be two new files called sandwich.txt.mine and
sandwich.txt.r2 which look like this:

    sandwich.txt.mine.unmerged           sandwich.txt.r2.unmerged
    --------------------------           ------------------------
    Top piece of bread                   Top piece of bread
    Mayonnaise                           Mayonnaise
    Lettuce                              Lettuce
    Tomato                               Tomato
    Provolone                            Provolone
    Salami                               Sauerkraut
    Mortadella                           Grilled Chicken
    Prosciutto                           Creole Mustard
    Creole Mustard                       Bottom piece of bread
    Bottom piece of bread

AUTHOR Quincy Bowers
Last Modification March 27, 2012