Mercurial > hg
view tests/test-wireproto.py.out @ 26605:ef21a2c41629
filemerge: add a wrapper around the filemerge function
We'll introduce a separate premerge function that calls the same code.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Sun, 11 Oct 2015 12:31:08 -0700 |
parents | d3d32643c060 |
children | 40381a88bab4 |