Mercurial > hg
view tests/test-diff-issue2761.t @ 48503:da38519cbd10
filemerge: rename backup variables from `back` to `backup`
`backup` seems like an obviously clearer name for something containing
something related to a backup.
Differential Revision: https://phab.mercurial-scm.org/D11876
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Mon, 06 Dec 2021 13:15:40 -0800 |
parents | 73e3e368bd42 |
children | 55c6ebd11cb9 |
line wrap: on
line source
Test issue2761 $ hg init $ touch to-be-deleted $ hg add adding to-be-deleted $ hg ci -m first $ echo a > to-be-deleted $ hg ci -m second $ rm to-be-deleted $ hg diff -r 0 Same issue, different code path $ hg up -C 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ touch does-not-exist-in-1 $ hg add adding does-not-exist-in-1 $ hg ci -m third $ rm does-not-exist-in-1 $ hg diff -r 1