thodg/libgit2/tests-clar/checkout

Diff

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

kmx.io     mail     discord kmxgit v0.4.0