##Git mergetool.
$ git config --global merge.tool=vimdiff
##vimdiff key mappings.
tokiclover tokiclover
tokiclover
/ KEYDB.cfg
Created
May 20, 2018 12:49
— forked from HenkPoley/KEYDB.cfg
KEYDB.cfg of 2017 september 2nd - 14:04:55, originally from http://labdv.com/aacs/ . downloaded from https://web.archive.org/web/20170902140455id_/http://www.labdv.com/aacs/KEYDB.cfg - you can use it with VLC 2.2.4 (not newer! - http://download.videolan.org/pub/videolan/vlc/2.2.4/ ) and libaacs.dll from https://vlc-bluray.whoknowsmy.name
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| ; KEYDB.cfg | |
| ; 2017-09-02 16:04:54 | |
| ; | |
| ; server: http://www.labdv.com/aacs | |
| ; processing keys: 18 (18 from doom9.org forum) | |
| ; host certificates: 8 (7 from doom9.org forum) | |
| ; disc VUK keys: 24010 keys for 23999 discs (0 from doom9.org forum) | |
| ; processing keys | |
| | PK | 0x810827A76E5B2CC1685E3217A23E2186 ; DK_V01-V12 |
tokiclover
/ vimdiff_cheet.md
Created
November 2, 2016 14:25
— forked from roothybrid7/vimdiff_cheet.md
vimdiff cheet sheets.
tokiclover
/ vimdiff.md
Created
November 2, 2016 14:11
— forked from mattratleph/vimdiff.md
vimdiff cheat sheet
##git mergetool
In the middle file (future merged file), you can navigate between conflicts with ]c and [c.
Choose which version you want to keep with :diffget //2 or :diffget //3 (the //2 and //3 are unique identifiers for the target/master copy and the merge/branch copy file names).
:diffupdate (to remove leftover spacing issues)
:only (once you’re done reviewing all conflicts, this shows only the middle/merged file)