| commit | d693b72c1c5def5fc7d8e5e526cb3ac13eafcd83 | [log] [tgz] |
|---|---|---|
| author | Shawn O. Pearce <sop@google.com> | Thu Oct 27 09:49:13 2011 -0700 |
| committer | Shawn O. Pearce <sop@google.com> | Thu Oct 27 09:49:13 2011 -0700 |
| tree | 0181a5058d1e0e6a45b8988433c56235e1209612 | |
| parent | b1962c40d006bb335a1c110975da93c63be68452 [diff] | |
| parent | 37118e70bc3c86e8fdafc31e4cc7026d71694ef4 [diff] |
Merge commit '37118e70bc3c86e8fdafc31e4cc7026d71694ef4' * commit '37118e70bc3c86e8fdafc31e4cc7026d71694ef4': Explain 'Automatically resolve conflicts'