Mercurial > hg

diff .hgignore @ 27597:fe150586d9bd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: explicitly request changed version in c/d conflict in test-commit-amend.t We're going to change the default for this in an upcoming patch, but in this instance we do want to continue picking the changed version.
author Siddharth Agarwal <sid0@fb.com>
date Wed, 23 Dec 2015 12:41:20 -0800
parents 3232f92360d4
children a1eff44c432b
line wrap: on
line diff