Repository navigation

Merge methods and tests and examples - #286

Merged

maxkorp merged 6 commits into

Nov 24, 2014

Merged

Merge methods and tests and examples#286
maxkorp merged 6 commits into
masterfrom
merge

Commits on Nov 24, 2014
- get a merge example up and running!
  maxkorp
  committed
  2e58866
- clean up and comment merge example
  maxkorp
  committed
  4c61589
- Changed merge so that you don't have to pass null in for options
  
  John Haley
  authored and
  maxkorp
  committed
  7fd6152
- merge with conflicts example partly done
  maxkorp
  committed
  7ae35d3
- merge examples now work!
  maxkorp
  committed
  8d215c6
- merge tests!
  maxkorp
  committed
  dcc97ed