Shiran Pasternak gingi

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)

This is now an actual repo:

https://github.com/cowboy/jquery-tiny-pubsub

	@implementation UITextView (RSExtras)


	static BOOL stringCharacterIsAllowedAsPartOfLink(NSString *s) {

	/*[s length] is assumed to be 0 or 1. s may be nil.
	Totally not a strict check.*/

	if (s == nil \|\| [s length] < 1)
	return NO;