• Show log

    Commit

  • Hash : e47f859d
    Author : Edward Thomson
    Date : 2013-08-08T16:46:49

    Don't overwrite ~ files checking out conflicts
    
    If a D/F conflict or rename 2->1 conflict occurs,
    we write the file sides as filename~branchname.  If
    a file with that name already exists in the working
    directory, write as filename~branchname_0 instead.
    (Incrementing 0 until a unique filename is found.)
    

  • 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.