Mercurial > hg
comparison tests/test-diff-ignore-whitespace.t @ 27005:3185c01c551c
mergestate: move _read() call to read constructor
With this patch, mergestate.clean() will no longer abort when it encounters an
unsupported merge type. However we hold off on testing it until backwards
compatibility is in place.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Tue, 17 Nov 2015 14:04:56 -0800 |
| parents | 405b6bd015df |
| children | da07367d683b |
comparison
equal
deleted
inserted
replaced
| 27004:a4c26918fb23 | 27005:3185c01c551c |
|---|