On 10 May 2011 09:12, Eli Zaretskii <eliz at gnu.org> wrote: > If I merge only specific files, as in > > bzr merge ../other-branch/foo > > does this also count as cherry-picking? That is, does Bazaar track > such merges in the history, or doesn't it? We don't track this at the moment. Martin