Documentation(tutorial): adjust merge example to the new merge world order.
commit361c06d8f5777c1037ad5c0e4d58f44cda4a5044
authorJunio C Hamano <junkio@cox.net>
Thu, 8 Dec 2005 00:44:12 +0000 (7 16:44 -0800)
committerJunio C Hamano <junkio@cox.net>
Thu, 8 Dec 2005 00:44:12 +0000 (7 16:44 -0800)
tree4170c0e15bc571ef19f481ad86100604a00449b1
parent6bad1902f52c861e5e0adfc479987ff84b22dafe
Documentation(tutorial): adjust merge example to the new merge world order.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Documentation/tutorial.txt