summaryrefslogtreecommitdiff
path: root/mergetools/diffuse
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-03-08 14:15:55 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-03-08 14:15:55 -0800
commit1cc625fd7a97f3335c837526cae36100adcd697f (patch)
tree9d068241731d391d82bbe87f991ecd159c1792a5 /mergetools/diffuse
parentUpdate draft release notes to 1.8.2 (diff)
parentgit svn: consistent spacing after "W:" in warnings (diff)
downloadtgif-1cc625fd7a97f3335c837526cae36100adcd697f.tar.xz
Merge git://git.bogomips.org/git-svn
* git://git.bogomips.org/git-svn: git svn: consistent spacing after "W:" in warnings git svn: ignore partial svn:mergeinfo
Diffstat (limited to 'mergetools/diffuse')
0 files changed, 0 insertions, 0 deletions