Skip to content

Commit

Permalink
upstream: cherry-pick ca6d269 onto f4517f3
Browse files Browse the repository at this point in the history 
This commit helps to teach `git rerere` to resolve merge 
conflicts when cherry-picking:

	ca6d269 (name-hash: specify initial size for istate.dir_hash table, 2016-11-17)
  • Loading branch information
@dscho
dscho committed Mar 30, 2017
1 parent 47bc067 commit d99cbc2
Showing 1 changed file with 482 additions and 73 deletions.
Loading

0 comments on commit d99cbc2

Please sign in to comment.