| commit | b04294eca18e3f1814c2451b9f9ce02d997598da | [log] [tgz] |
|---|---|---|
| author | Vitaly Buka <vitalybuka@google.com> | Thu Oct 15 17:35:53 2015 -0700 |
| committer | Vitaly Buka <vitalybuka@google.com> | Thu Oct 15 17:35:53 2015 -0700 |
| tree | 62157f29289248104185d26f244e2b1c3b51ab55 | |
| parent | c51722f756cb0113603dd1900804e3018f2dfd4b [diff] | |
| parent | 35fb87b830270adaf3b24b18cb43db8debb62bd8 [diff] |
git merge --no-ff 35fb87b830270adaf3b24b18cb43db8debb62bd8