Mercurial > hg
comparison mercurial/hgweb/hgwebdir_mod.py @ 26572:c7850af6bb75
filemerge._merge: 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:16:19 -0700 |
parents | 4b0fc75f9403 |
children | 56b2bcea2529 |
comparison
equal
deleted
inserted
replaced
26571:a024e2db4553 | 26572:c7850af6bb75 |
---|