Skip to content

Instantly share code, notes, and snippets.

@xai

xai/base.c

Created February 26, 2018 16:17
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save xai/c694d0e973d2274c00781d9450c0e69e to your computer and use it in GitHub Desktop.
Save xai/c694d0e973d2274c00781d9450c0e69e to your computer and use it in GitHub Desktop.
Download ZIP
Merge example
Raw
base.c
int f(int x) {
return x;
}
Raw
left.c
int f(int x) {
x++;
return x;
}
Raw
merge.c
int f(int x) {
<<<<<<< left.c
=======
>>>>>>> right.c
x++;
return x;
}
Raw
right.c
int f(int x) {
x++;
return x;
}
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment