• Show log

    Commit

  • Hash : 216f97e4
    Author : Edward Thomson
    Date : 2013-09-23T09:47:47

    Two-step conflict checkout (load / perform)
    
    Move conflict handling into two steps: load the conflicts and
    then apply the conflicts.  This is more compatible with the
    existing checkout implementation and makes progress reporting
    more sane.
    

  • README.md

  • Writing Clar tests for libgit2

    For information on the Clar testing framework and a detailed introduction please visit:

    https://github.com/vmg/clar

    • Write your modules and tests. Use good, meaningful names.

    • Make sure you actually build the tests by setting:

        cmake -DBUILD_CLAR=ON build/
    • Test:

        ./build/libgit2_clar
    • Make sure everything is fine.

    • Send your pull request. That’s it.