Mercurial > hg
diff hgext/mq.py @ 26574:f82cb7dffb49
filemerge._xmerge: drop no longer necessary 'if r:' check
Cleanup from an earlier patch to make premerge be directly called from the main
filemerge function.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Thu, 08 Oct 2015 14:18:43 -0700 |
parents | 2aa0dde846b4 |
children | 8bd2759f1fa7 |