summaryrefslogtreecommitdiff
path: root/builtin/reset.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-02-25 08:04:05 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-02-25 08:04:05 -0800
commit92f561d7f0f249d7f15cddce1d438d229e689e87 (patch)
tree503257255069f121840a4b70a65827b1fdb63e73 /builtin/reset.c
parentMerge branch 'bw/get-tz-offset-perl' into maint (diff)
parentp4merge: fix printf usage (diff)
downloadtgif-92f561d7f0f249d7f15cddce1d438d229e689e87.tar.xz
Merge branch 'da/p4merge-mktemp-fix' into maint
* da/p4merge-mktemp-fix: p4merge: fix printf usage
Diffstat (limited to 'builtin/reset.c')
0 files changed, 0 insertions, 0 deletions