Mercurial > hg
diff tests/test-url-rev.t @ 21541:6062593d8b06
resolve: don't abort resolve -l even when no merge is in progress
This broke some internal automation that was quite reasonably checking for
unresolved files as a way to determine whether a merge happened cleanly. We
still abort for resolve --mark etc.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Fri, 23 May 2014 13:10:31 -0700 |
| parents | 4cf09a1bf5b2 |
| children | 82b2ba904e3e |