summaryrefslogtreecommitdiff
path: root/builtin-merge.c
diff options
context:
space:
mode:
authorLibravatar Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com>2008-08-28 14:23:52 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-08-29 00:14:30 -0700
commit53d1589ff6bd336e3ece39e0a963a3d2a537cf96 (patch)
treef3bf80bd63fc1975d9a4292b7d271909ce36ef03 /builtin-merge.c
parentpretty=format: respect date format options (diff)
downloadtgif-53d1589ff6bd336e3ece39e0a963a3d2a537cf96.tar.xz
tutorial: gentler illustration of Alice/Bob workflow using gitk
Update to gitutorial as discussedin the git mailing list: http://marc.info/?t=121969390900002&r=1&w=2 Signed-off-by: Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge.c')
0 files changed, 0 insertions, 0 deletions