]> granicus.if.org Git - git/commitdiff
projects / git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fbebb5c aed7480)
Merge branch 'mm/lockfile-error-message'
authorJunio C Hamano <gitster@pobox.com>
Sun, 3 Apr 2016 17:29:27 +0000 (10:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 3 Apr 2016 17:29:27 +0000 (10:29 -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.