Permalink
Browse files

automerge Gemfile.lock strategy

  • Loading branch information...
will committed Jul 16, 2010
1 parent d965760 commit 4ed4930c61df795b7fbc9732d3c6463164ebb43f
Showing with 3 additions and 0 deletions.
  1. +3 −0 gitconfig
View
@@ -34,3 +34,6 @@
autosetupmerge = true
[apply]
whitespace = nowarn
[merge "gemfilelock"]
name = relocks the gemfile.lock
driver = bundle lock

0 comments on commit 4ed4930

Please sign in to comment.