Mercurial > public > mercurial-scm > hg
log mercurial/filemerge.py @ 26573:a875773cf537
age | author | description |
---|---|---|
Thu, 08 Oct 2015 14:17:31 -0700 | Siddharth Agarwal | filemerge._idump: drop no longer necessary 'if r:' check |
Thu, 08 Oct 2015 14:16:19 -0700 | Siddharth Agarwal | filemerge._merge: drop no longer necessary 'if r:' check |
Wed, 07 Oct 2015 21:22:16 -0700 | Siddharth Agarwal | filemerge: call premerge directly from main merge function |