]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4cd1b99 3ca399d)
Merge branch 'js/merge-rr-fix'
authorJunio C Hamano <gitster@pobox.com>
Thu, 15 Jul 2010 19:08:36 +0000 (12:08 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 15 Jul 2010 19:08:36 +0000 (12:08 -0700)
* js/merge-rr-fix:
  MERGE_RR is in .git, not .git/rr-cache

1  2 
builtin/rerere.c patch | diff1 | diff2 | blob | history

diff --cc builtin/rerere.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.