summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-10-05 12:36:26 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-10-05 12:36:26 -0700
commit9a33b691aaaae995b2da65a08d927c31106c8a3d (patch)
treed07a1efd88b32931baaf9f9d3940973cbb447bf1 /git-mergetool.sh
parentMerge branch 'jn/gitweb-highlite-sanitise' (diff)
parentRemove 'working copy' from the documentation and C code (diff)
downloadtgif-9a33b691aaaae995b2da65a08d927c31106c8a3d.tar.xz
Merge branch 'cn/eradicate-working-copy'
* cn/eradicate-working-copy: Remove 'working copy' from the documentation and C code
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions