Philipp Nowak literalplus

## vimdiff.md

      
              1 file
            
          
              97 forks
            
          
              22 comments
            
          
              576 stars
            
          
                mattratleph
                / vimdiff.md
            
            
              Last active
              May 9, 2024 03:11
                — forked from roothybrid7/vimdiff_cheet.md
            
              
                vimdiff cheat sheet
              
          
    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)

  
## TeleportFixTwo.java
// Released under the BSD License.
// Kristian S. Stangeland 2013.

package com.comphenix.example;

import java.util.ArrayList;
import java.util.List;

import org.bukkit.Server;
import org.bukkit.entity.Player;

## gist:581868
<!DOCTYPE html>

<!-- Helpful things to keep in your <head/>
  // Brian Blakely, 360i
  // http://twitter.com/brianblakely/
-->
  <head>

    <!-- Disable automatic DNS prefetching.
	// Released under the BSD License.
	// Kristian S. Stangeland 2013.

	package com.comphenix.example;

	import java.util.ArrayList;
	import java.util.List;

	import org.bukkit.Server;
	import org.bukkit.entity.Player;
	<!DOCTYPE html>

	<!-- Helpful things to keep in your <head/>
	// Brian Blakely, 360i
	// http://twitter.com/brianblakely/
	-->
	<head>

	<!-- Disable automatic DNS prefetching.