• Show log

    Commit

  • Hash : 7fa73de1
    Author : Edward Thomson
    Date : 2013-09-23T17:52:40

    Move functions in checkout_conflicts to checkout.c
    
    It seemed exceptionally silly to have a split there
    where no split needed to be.