Mercurial > hg-stable

comparison tests/test-conflict @ 10185:7637fe4f525d stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mq: preserve --git flag when merging patches Without this, merging a patch queue without diff.git=1 downgrades all git patches to regular patches, losing data in the process.
author Patrick Mezard <pmezard@gmail.com>
date Fri, 01 Jan 2010 19:53:05 +0100
parents 93a4e72b4f83
children
comparison
equal deleted inserted replaced
10184:8a47347d298b 10185:7637fe4f525d