summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-12-08 00:44:12 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-12-08 00:44:12 (GMT)
commit361c06d8f5777c1037ad5c0e4d58f44cda4a5044 (patch)
tree4170c0e15bc571ef19f481ad86100604a00449b1 /diff.h
parent6bad1902f52c861e5e0adfc479987ff84b22dafe (diff)
downloadgit-361c06d8f5777c1037ad5c0e4d58f44cda4a5044.zip
git-361c06d8f5777c1037ad5c0e4d58f44cda4a5044.tar.gz
git-361c06d8f5777c1037ad5c0e4d58f44cda4a5044.tar.bz2
Documentation(tutorial): adjust merge example to the new merge world order.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'diff.h')
0 files changed, 0 insertions, 0 deletions