summaryrefslogtreecommitdiff
path: root/resolve-undo.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-08-21 23:20:51 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-08-21 23:20:51 -0700
commita0b6a9d2b2b0667bc170c864a05b3ec4635a71bb (patch)
tree1767f40391f3440d8b6e9ffb39976bec6fb707c8 /resolve-undo.c
parentMerge branch 'ab/perl-install' (diff)
parentUserdiff patterns for C# (diff)
downloadtgif-a0b6a9d2b2b0667bc170c864a05b3ec4635a71bb.tar.xz
Merge branch 'po/userdiff-csharp'
* po/userdiff-csharp: Userdiff patterns for C#
Diffstat (limited to 'resolve-undo.c')
0 files changed, 0 insertions, 0 deletions