Mercurial > hg
diff hgext/blackbox.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 | 999e1acc61aa |
children | d5883fd055c6 |
author | timeless <timeless@mozdev.org> |
---|---|
date | Thu, 17 Mar 2016 00:36:01 +0000 |
parents | 999e1acc61aa |
children | d5883fd055c6 |