Skip to content

Instantly share code, notes, and snippets.

View dsaw's full-sized avatar
🎯
Focusing

देवेश (devesh) dsaw

🎯
Focusing
15 followers · 78 following
View GitHub Profile
@dsaw
dsaw / vimdiff.md
Last active May 3, 2018 16:52
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 LO or :diffget RE (the LO and RE 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)

@dsaw
dsaw / c++Template.cpp
Created December 3, 2017 06:29 — forked from kodekracker/c++Template.cpp
Basic C++ Template for Competitive Programming
/*
* Note: This template uses some c++11 functions , so you have to compile it with c++11 flag.
* Example:- $ g++ -std=c++11 c++Template.cpp
*
* Author : Akshay Pratap Singh
* Handle: code_crack_01
*
*/
/******** All Required Header Files ********/