mercurial/merge.py
Wed, 16 Sep 2015 12:36:21 -0700 Siddharth Agarwal merge: move merge step to the end
Sat, 08 Aug 2015 19:41:25 -0700 Gregory Szorc merge: use absolute_import
Thu, 25 Jun 2015 17:54:55 -0500 Matt Mackall merge: make merge.preferancestor type and default consistent
Thu, 25 Jun 2015 17:53:16 -0500 Matt Mackall merge: mark ancient debugging option
Wed, 08 Jul 2015 17:01:09 +0900 FUJIWARA Katsunori merge: remove useless dirstate.normallookup() invocation in applyupdates()
Tue, 23 Jun 2015 22:20:08 -0700 Gregory Szorc global: mass rewrite to use modern exception syntax
Sat, 16 May 2015 14:34:19 -0400 Augie Fackler cleanup: use __builtins__.all instead of util.all
less more (0) -300 -100 -30 -10 -7 tip