| commit | 958640520863b283a44517ee492182cbcd644c28 | [log] [tgz] |
|---|---|---|
| author | Shawn Pearce <sop@google.com> | Wed Dec 19 17:55:43 2012 -0800 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Dec 19 17:55:44 2012 -0800 |
| tree | fb76783bd6acaf1c861ef631ef07c9abb46f8948 | |
| parent | 8c8bb00edd51c009acd7b6a3419d6f41febe4d48 [diff] | |
| parent | f6ddb6531581fc39bd595df13ed468e74eda1f59 [diff] |
Merge "Fix: don't display all files from a merge-commit when auto-merge fails"