commit | 2710af55eb04237f712861c71bbe575468c45160 | [log] [tgz] |
---|---|---|
author | Edwin Kempin <edwin.kempin@sap.com> | Wed Nov 06 08:36:39 2013 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Nov 06 08:36:39 2013 +0000 |
tree | 48c5e1d01af21bd29d8ff07807530cc4b1c5c641 | |
parent | f900b444fc20565159ca39b65afd4faa6de209cc [diff] | |
parent | 10b49dce9c67a7a8cdd3f5c685baac10eea73c2c [diff] |
Merge "Support 'conflicts:<change>' operator to find changes with same files"