James E. Blair 266aa44260 Make the merge in gerrit-git-prep like gerrit.
Fixes bug 981040.

Change-Id: I89960b76f1ae6e5be6b2f5fc4695f00a7c90452a
2012-06-19 15:28:36 -07:00
..