Mercurial > hg
comparison mercurial/wireproto.py @ 23026:fe80fdf68ba7
test-merge5: remove obsolete '-y' and its motivating comment
The '-y' in 'hg update -y' was once needed to answer questions about
modify/delete conflicts. That is no longer needed, so remove the '-y'
and the comment justifying its use.
| author | Martin von Zweigbergk <martinvonz@gmail.com> |
|---|---|
| date | Thu, 09 Oct 2014 16:57:45 -0700 |
| parents | 90f86ad3d4ff |
| children | e53f6b72a0e4 |
comparison
equal
deleted
inserted
replaced
| 23025:b8dd8432395d | 23026:fe80fdf68ba7 |
|---|