public
Description: Example of how to handle git merges
Clone URL: git://github.com/farktronix/gitmergeexample.git
Adding NACHOS
farktronix (author)
Fri Apr 25 02:24:40 -0700 2008
commit  32e89b49351dc6a0189c1861e7751063f2088a5d
tree    60bb9f4f948da25257062240f15155b6f3a17cab
parent  bf5dc01877b08e9c5dc3532cb89a551574488f3c
0
...
1
 
2
...
1
2
3
0
@@ -1,2 +1,3 @@
0
 This is line 1
0
+NACHOS
0
 This is line 2

Comments

    No one has commented yet.