Mercurial > public > mercurial-scm > hg

log mercurial/merge.py @ 23396:6a254a2dd37c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -300 -100 -30 -10 -6 tip
age author description
Mon, 24 Nov 2014 16:16:34 -0800 Martin von Zweigbergk merge: separate out "both created" cases
Mon, 24 Nov 2014 16:11:22 -0800 Martin von Zweigbergk merge: indent to prepare for next patch
Mon, 24 Nov 2014 09:50:27 -0800 Martin von Zweigbergk merge: remove obsolete check for untracked files in 'dm' action
Sun, 23 Nov 2014 23:10:34 -0800 Martin von Zweigbergk merge: remove dead assignment in applyupdates()
Fri, 21 Nov 2014 13:06:04 -0800 Martin von Zweigbergk merge: move calculateupdates() before applyupdated()
Mon, 24 Nov 2014 11:28:46 -0800 Martin von Zweigbergk merge: remove unused variables from _checkcollision()
less more | (0) -300 -100 -30 -10 -6 tip