Mercurial > hg
comparison .hgsigs @ 26850:00209e38e7d9
test-merge-prompt.t: add tests for linear updates + change/delete conflicts
Turns out this bit of code was woefully untested.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Mon, 02 Nov 2015 12:25:15 -0800 |
parents | 58b7f3e93bba |
children | a45821a808ab |
comparison
equal
deleted
inserted
replaced
26849:a6eb4e481134 | 26850:00209e38e7d9 |
---|