Mercurial > hg
diff mercurial/ancestor.py @ 28532:ed75909c4c67
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 15 Mar 2016 14:10:46 -0700 |
parents | 7ef98b38163f |
children | ead25aa27a43 |
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 15 Mar 2016 14:10:46 -0700 |
parents | 7ef98b38163f |
children | ead25aa27a43 |