summaryrefslogtreecommitdiff
path: root/resolve-undo.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-07-12 12:04:14 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-07-12 12:04:14 -0700
commit624ec4f99d8c58d17ccf5ca8d42bf329a68b731d (patch)
treec74212f4370b2a1a316808c0f285bdd1658d2b94 /resolve-undo.c
parentMerge branch 'ft/diff-rename-default-score-is-half' (diff)
parentname-rev doc: rewrite --stdin paragraph (diff)
downloadtgif-624ec4f99d8c58d17ccf5ca8d42bf329a68b731d.tar.xz
Merge branch 'rr/name-rev-stdin-doc'
* rr/name-rev-stdin-doc: name-rev doc: rewrite --stdin paragraph
Diffstat (limited to 'resolve-undo.c')
0 files changed, 0 insertions, 0 deletions