]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 91ca5f1 93bab2d)
Merge branch 'fr/vimdiff-layout-fixes'
authorJunio C Hamano <gitster@pobox.com>
Tue, 8 Apr 2025 18:43:16 +0000 (11:43 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 Apr 2025 18:43:16 +0000 (11:43 -0700)
Layout configuration in vimdiff backend didn't work as advertised,
which has been corrected.

* fr/vimdiff-layout-fixes:
  mergetools: vimdiff: add tests for layout with REMOTE as the target
  mergetools: vimdiff: fix layout where REMOTE is the target

1  2 
mergetools/vimdiff patch | diff1 | diff2 | blob | history

diff --cc mergetools/vimdiff
Simple merge
Unnamed repository; edit this file 'description' to name the repository.