]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit09977c5f501bc0438dfaa99690491c849895f476
tree1f835b1b8df4c03ea0c7344b5ddab7058744d675tree | snapshot
parent91ca5f1b1da4c3b29d89b246ffb8e95d03204092commit | diff
parent93bab2d04be7ac304a5dd899daccd3e357126f79commit | diff
Merge branch 'fr/vimdiff-layout-fixes'

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
mergetools/vimdiff diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.