https://apealive.net/tags/vimdiff/Recent content in Vimdiff on make me: APeHugoen-usMon, 28 Dec 2020 08:07:51 +0000https://apealive.net/post/vimdiff-cheat-sheet/Mon, 28 Dec 2020 08:07:51 +0000https://apealive.net/post/vimdiff-cheat-sheet/<p>This article covers <strong>Vimdiff Cheat Sheet &amp; Visual Code Merging Guide</strong>, originally published as a secure <a href="https://gist.github.com/epcim/3f4842d5d3307a438de425ab121df212" target="_blank" rel="noopener noreferrer">GitHub Gist</a> snippet.</p> <h1 id="vimdiff-cheat-sheet">vimdiff cheat sheet<a class="heading-anchor" href="#vimdiff-cheat-sheet" aria-hidden="true">#</a> </h1> <p>##git mergetool</p> <p>In the middle file (future merged file), you can navigate between conflicts with <code>]c</code> and <code>[c</code>.</p> <p>Choose which version you want to keep with <code>:diffget //2</code> or <code>:diffget //3</code> (the <code>//2</code> and <code>//3</code> are unique identifiers for the target/master copy and the merge/branch copy file names).</p>