Mercurial > hg

diff mercurial/mail.py @ 20593:3678707e4017 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: add "other" file node in the merge state file This data is mostly redundant with the "other" changeset node (+ other changeset file path). However, more data never hurt. The old format do not store it so this require some dancing to add and remove it on demand.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Tue, 25 Feb 2014 18:54:47 -0800
parents c80feeb715d1
children a4af6fd99fb0
line wrap: on
line diff