Skip to content

Instantly share code, notes, and snippets.

@rnewman

rnewman/gist:26cdd2d5845e0dc0e636

Created February 1, 2016 23:06
Show Gist options
  • Save rnewman/26cdd2d5845e0dc0e636 to your computer and use it in GitHub Desktop.
Save rnewman/26cdd2d5845e0dc0e636 to your computer and use it in GitHub Desktop.
Download ZIP
Basic merging output.
Raw
gistfile1.txt
Deleted locally:
Deleted remotely:
Deleted from mirror:
Root:
[V: □ M □ root________ Unchanged ]
[S: Unchanged ]
..
[V: □ M L menu________ Local ]
[S: Local ]
..
[V: □ M L toolbar_____ Local ]
[S: Local ]
..
[V: □ M L unfiled_____ Local ]
[S: Local ]
..
[V: R □ L mobile______ Unchanged ]
[S: Remote ]
..
[V: R □ □ emptyempty01 Remote ]
[S: Remote ]
..
[V: R □ □ emptyempty02 Remote ]
[S: Remote ]
..
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment