Skip to content

Commit

Permalink
resolve: 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
2 parents d99cbc2 + 9b2fa9a commit 61082df
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 61082df

Please sign in to comment.