Browse Source

Merge branch 'jc/lock-report-on-error'

* jc/lock-report-on-error:
  lockfile: move REPORT_ON_ERROR bit elsewhere
maint
Junio C Hamano 8 years ago
parent
commit
af09003b28
  1. 2
      lockfile.h

2
lockfile.h

@ -137,7 +137,7 @@ struct lock_file { @@ -137,7 +137,7 @@ struct lock_file {
* ... this flag can be passed instead to return -1 and give the usual
* error message upon an error.
*/
#define LOCK_REPORT_ON_ERROR 2
#define LOCK_REPORT_ON_ERROR 4

/*
* Usually symbolic links in the destination path are resolved. This

Loading…
Cancel
Save