summaryrefslogtreecommitdiff
path: root/resolve-undo.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-10-06 13:49:45 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-10-06 13:49:45 -0700
commitc752e7f3e8d96a9673ad248addc9418164bd3ce6 (patch)
tree812bbca3530914a49161074d1aa1f4f051737c09 /resolve-undo.h
parentdiffcore-pickaxe.c: a void function shouldn't try to return something (diff)
parentt/t3415: use && where applicable. (diff)
downloadtgif-c752e7f3e8d96a9673ad248addc9418164bd3ce6.tar.xz
Merge branch 'maint'
* maint: t/t3415: use && where applicable. SubmittingPatches: Document some extra tags used in commit messages
Diffstat (limited to 'resolve-undo.h')
0 files changed, 0 insertions, 0 deletions