commit | 2e1d237b6fb744520b79cb03dde564877303f568 | [log] [tgz] |
---|---|---|
author | Shawn O. Pearce <sop@google.com> | Tue Feb 17 16:26:23 2009 -0800 |
committer | Shawn O. Pearce <sop@google.com> | Tue Feb 17 16:26:23 2009 -0800 |
tree | 10d278d2b842335640c8effaf018a34ad8137a31 | |
parent | aaa715f18c2cb84e58cc4f6012b08eafde0b090a [diff] |
Correct grammar in the patch conflict messages Signed-off-by: Shawn O. Pearce <sop@google.com>