summaryrefslogtreecommitdiff
path: root/resolve-undo.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-10-16 14:32:56 -0700
committerJunio C Hamano <gitster@pobox.com>2015-10-16 14:32:56 -0700
commit0dd9e571e837d0f3567af7cb83f92034b4a18ee3 (patch)
treea81fe85cb1dbf1bc99d05c528da9a4206316c50f /resolve-undo.c
parent9ab74762cdb32d17fcb811e8721b706ed5c0570b (diff)
parenta43eb67e653ccaa9a00ff52adb706201d7b1af13 (diff)
downloadgit-0dd9e571e837d0f3567af7cb83f92034b4a18ee3.tar.gz
Merge branch 'tk/doc-interpret-trailers-grammo' into maint
* tk/doc-interpret-trailers-grammo: Documentation/interpret-trailers: Grammar fix
Diffstat (limited to 'resolve-undo.c')
0 files changed, 0 insertions, 0 deletions