log mercurial/merge.py @ 13162:115a9760c382

age author description
Mon, 13 Dec 2010 11:46:31 -0500 Greg Ward merge: document some internal return values.
Tue, 07 Dec 2010 03:29:21 +0100 Mads Kiilerich merge: fast-forward merge with descendant