Mercurial > hg

diff tests/test-inotify-issue1542.t @ 18035:5881d5b7552f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: refactor action calculation into function This pulls the code used to calculate the changes that need to happen during merge.update() into a separate function. This is not useful on its own, but is instead preparatory to performing grafts in memory when there are no potential conflicts.
author David Schleimer <dschleimer@fb.com>
date Tue, 04 Dec 2012 12:54:18 -0800
parents 92b2c876a79d
children f7c4eb60b0c3
line wrap: on
line diff