]> git.ipfire.org Git - thirdparty/git.git/commit
mergetools: vimdiff: silence annoying messages
authorFelipe Contreras <felipe.contreras@gmail.com>
Wed, 10 Aug 2022 15:46:14 +0000 (10:46 -0500)
committerJunio C Hamano <gitster@pobox.com>
Wed, 10 Aug 2022 19:39:24 +0000 (12:39 -0700)
commit66dd83ad09bce1d4234f853a004c2d22d485fd84
tree69469fc1810f53f48eaabda00d990b6cbf0c654e
parent79db50d82103dcf64cb379eb08074ebb5d66c2d1
mergetools: vimdiff: silence annoying messages

When using the single window mode we are greeted with the following
warning:

  "./content_LOCAL_8975" 6L, 28B
  "./content_BASE_8975" 6 lines, 29 bytes
  "./content_REMOTE_8975" 6 lines, 29 bytes
  "content" 16 lines, 115 bytes
  Press ENTER or type command to continue

every time.

Silence that.

Suggested-by: Fernando Ramos <greenfoo@u92.eu>
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Reviewed-by: Fernando Ramos <greenfoo@u92.eu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
mergetools/vimdiff