| commit | 6736bebf616377ccb75cb8894bd0eb5fbf44edcc | [log] [tgz] |
|---|---|---|
| author | James E. Blair <jeblair@openstack.org> | Thu Jul 11 15:18:15 2013 -0700 |
| committer | James E. Blair <jeblair@openstack.org> | Thu Jul 18 14:49:04 2013 -0700 |
| tree | 3f917589444a72cd6a14ee2e870e78806a18d1b8 | |
| parent | c225b4dcf4fa259eb0ce651438cb7e5f8fc4a525 [diff] |
Dequeue changes immediately on merge conflicts Change-Id: I4a2b9c5bc3a5659e874fe2bccbbd61da01713b9a