summaryrefslogtreecommitdiff
path: root/resolve-undo.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-04-18 21:31:29 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-04-18 21:31:29 -0700
commit779f9467ebcd345e60118db89e2c0a4b38204607 (patch)
treebaa2358b904b55580ab4f07488ebcd16051775e5 /resolve-undo.c
parentMerge branch 'maint' (diff)
parentt3301: add tests to use --format="%N" (diff)
downloadtgif-779f9467ebcd345e60118db89e2c0a4b38204607.tar.xz
Merge branch 'jg/auto-initialize-notes-with-percent-n-in-format'
* jg/auto-initialize-notes-with-percent-n-in-format: t3301: add tests to use --format="%N" pretty: Initialize notes if %N is used
Diffstat (limited to 'resolve-undo.c')
0 files changed, 0 insertions, 0 deletions