1. 29 Jun, 2015 1 commit
  2. 26 Jun, 2015 1 commit
  3. 25 Jun, 2015 3 commits
  4. 20 Jun, 2015 1 commit
  5. 02 Jun, 2015 1 commit
  6. 29 May, 2015 1 commit
    • Rename GIT_EMERGECONFLICT to GIT_ECONFLICT · 885b94aa
      We do not error on "merge conflicts"; on the contrary, merge conflicts
      are a normal part of merging.  We only error on "checkout conflicts",
      where a change exists in the index or the working directory that would
      otherwise be overwritten by performing the checkout.
      
      This *may* happen during merge (after the production of the new index
      that we're going to checkout) but it could happen during any checkout.
      Edward Thomson committed
  7. 13 May, 2015 1 commit
  8. 11 May, 2015 7 commits