jessemortenson / git-conflict-resolution-demo Goto Github PK
View Code? Open in Web Editor NEWThis project forked from nruth/git-conflict-resolution-demo
a simple git conflict resolution tutorial
Home Page: http://nruth.github.com/git-conflict-resolution-demo