1. 26 Jun, 2018 1 commit
    • index::names tests: add conflicts with high stages · c4ce017f
      We add entries into the main index to correspond with the NAME entries
      that we're going to test.  NAME entries store the results of conflicts
      occuring with rename detection during merge, and they must correspond to
      conflicts in the index.
      
      This test was mistakenly adding regular entries.  The checkout
      validation failed, since it requires NAME entries to correspond to
      high-stage (conflict) entries.  Correct the test to actually create
      conflicts.
      Edward Thomson committed
  2. 25 Jun, 2018 2 commits
  3. 24 Jun, 2018 2 commits
  4. 22 Jun, 2018 4 commits
  5. 18 Jun, 2018 5 commits
  6. 17 Jun, 2018 1 commit
  7. 16 Jun, 2018 1 commit
  8. 15 Jun, 2018 24 commits