summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-12-27 09:12:09 -0800
committerJunio C Hamano <gitster@pobox.com>2016-12-27 09:12:09 -0800
commitb22d7484034670d08f438c9f1376423adce1e29c (patch)
tree8832c61cff0797ea19ed1c0b1d93d6f1bbfa5c01 /diff.c
parent3f061bf514667497a948804828064b9b9c3b249b (diff)
downloadgit-b22d7484034670d08f438c9f1376423adce1e29c.tar.gz
lockfile: move REPORT_ON_ERROR bit elsewherejc/lock-report-on-error
There was LOCK_NO_DEREF defined as 2 = 1<<1 with the same value, which was missed due to a huge comment block. Deconflict by moving the new one to 4 = 1<<2 for now. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.c')
0 files changed, 0 insertions, 0 deletions