diff tests/test-diff-binary-file.t @ 44414:218feb1a7e00

graft: always allow hg graft --base . (issue6248) `hg graft --base . -r abc` is rejected before this change with a "nothing to merge" error, if `abc` does not descend from `.`. This looks like an artifact of the implementation rather than intended behavior. It makes perfect sense to apply the diff between `.` and `abc` to the working copy (i.e. degenerate into `hg revert`), regardless of what `abc` is. Differential Revision: https://phab.mercurial-scm.org/D8127
author Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
date Mon, 17 Feb 2020 20:30:03 -0500
parents 5abc47d4ca6b
children
line wrap: on
line diff