summaryrefslogtreecommitdiff
path: root/notes-cache.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-02-27 21:58:30 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-02-27 21:58:30 -0800
commit66a6a3142074473c91eb7f11de4d745647d43540 (patch)
treea532985d98f541d276965d42600362fd372669c5 /notes-cache.h
parentMerge branch 'nd/sorted-builtin-command-list' (diff)
parentmergetool: don't skip modify/remove conflicts (diff)
downloadtgif-66a6a3142074473c91eb7f11de4d745647d43540.tar.xz
Merge branch 'mz/rerere-remaining'
* mz/rerere-remaining: mergetool: don't skip modify/remove conflicts rerere "remaining"
Diffstat (limited to 'notes-cache.h')
0 files changed, 0 insertions, 0 deletions