summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-09-08 09:17:01 -0700
committerJunio C Hamano <gitster@pobox.com>2010-09-08 09:17:01 -0700
commit1d86cb80ceee1e93eacded1555abd7f113857efd (patch)
tree24d2dc19078993d54ec0b00906a005a34337dcca /builtin/merge.c
parentb815a726e9da97924b44d551b10d3fef3b3d1885 (diff)
parent1ee1e43df37e53b0bc50a0eda57dd1772dc220f5 (diff)
downloadgit-1d86cb80ceee1e93eacded1555abd7f113857efd.tar.gz
Merge branch 'jh/error-removing-missing-note'
* jh/error-removing-missing-note: notes: Don't create (empty) commit when removing non-existing notes
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions