summaryrefslogtreecommitdiff
path: root/resolve-undo.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-04-02 13:09:21 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-04-02 13:11:49 -0700
commitd82829b6128263951569221ca0c00dd143da055c (patch)
tree3d24c2c1be3a76cc7574cd5f65732cd3ac9c3450 /resolve-undo.h
parentMerge git://github.com/git-l10n/git-po (diff)
parentGit 1.7.9.6 (diff)
downloadtgif-d82829b6128263951569221ca0c00dd143da055c.tar.xz
Sync with 1.7.9.6
Diffstat (limited to 'resolve-undo.h')
0 files changed, 0 insertions, 0 deletions