D381: simplemerge: stop accepting, and passing, file parameters

2017-08-25 Thread phillco (Phil Cohen)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGfa6309c5761d: simplemerge: stop accepting, and passing, file parameters (authored by phillco). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D381?vs=1278=1287

D381: simplemerge: stop accepting, and passing, file parameters

2017-08-24 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 1278. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D381?vs=1220=1278 REVISION DETAIL https://phab.mercurial-scm.org/D381 AFFECTED FILES contrib/simplemerge mercurial/filemerge.py mercurial/simplemerge.py

D381: simplemerge: stop accepting, and passing, file parameters

2017-08-23 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 1220. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D381?vs=1041=1220 REVISION DETAIL https://phab.mercurial-scm.org/D381 AFFECTED FILES contrib/simplemerge mercurial/filemerge.py mercurial/simplemerge.py

D381: simplemerge: stop accepting, and passing, file parameters

2017-08-17 Thread phillco (Phil Cohen)
phillco updated this revision to Diff 1041. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D381?vs=862=1041 REVISION DETAIL https://phab.mercurial-scm.org/D381 AFFECTED FILES contrib/simplemerge mercurial/filemerge.py mercurial/simplemerge.py

D381: simplemerge: stop accepting, and passing, file parameters

2017-08-14 Thread phillco (Phil Cohen)
phillco created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D381 AFFECTED FILES contrib/simplemerge mercurial/filemerge.py mercurial/simplemerge.py CHANGE