Mercurial > hg
diff mercurial/ancestor.py @ 28578:66d085e55ecd
filemerge: indicate that local/other are p1/p2
author | timeless <timeless@mozdev.org> |
---|---|
date | Thu, 17 Mar 2016 00:36:01 +0000 |
parents | 7ef98b38163f |
children | ead25aa27a43 |
author | timeless <timeless@mozdev.org> |
---|---|
date | Thu, 17 Mar 2016 00:36:01 +0000 |
parents | 7ef98b38163f |
children | ead25aa27a43 |