Mercurial > hg
diff mercurial/osutil.c @ 26573:a875773cf537
filemerge._idump: 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:17:31 -0700 |
parents | 40b05303ac32 |
children | fa6685ea7ad8 |