]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 167259b aed7480)
Merge branch 'mm/lockfile-error-message' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 15 Apr 2016 01:37:12 +0000 (18:37 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 15 Apr 2016 01:37:12 +0000 (18:37 -0700)
* mm/lockfile-error-message:
  lockfile: improve error message when lockfile exists
  lockfile: mark strings for translation


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.