mbox series

[0/1] Improve unpack trees error text

Message ID pull.447.git.1572995581.gitgitgadget@gmail.com (mailing list archive)
Headers show
Series Improve unpack trees error text | expand

Message

Linus Arver via GitGitGadget Nov. 5, 2019, 11:13 p.m. UTC 
Improve the following error text:error: Entry 'file.txt' not uptodate.
Cannot merge.It would not appear as:error: Entry 'file.txt' is not up to
date. Cannot merge.

naiduv (1):
  Improve unpack trees error text

 t/t7110-reset-merge.sh | 4 ++--
 unpack-trees.c         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)


base-commit: da72936f544fec5a335e66432610e4cef4430991
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-447%2Fnaiduv%2Fpatch-2-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-447/naiduv/patch-2-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/447