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
..
2012-06-14 11:03:22 -07:00
2012-06-05 22:59:46 +00:00
2011-07-31 10:26:19 -07:00
2012-06-14 09:54:33 -07:00
2012-06-05 22:59:46 +00:00
2012-06-05 22:59:46 +00:00
2012-06-19 13:00:58 -07:00
2012-06-05 22:59:46 +00:00
2012-02-06 16:32:34 +00:00
2012-06-05 22:59:46 +00:00
2012-06-05 22:59:46 +00:00
2012-05-31 20:56:35 +00:00