]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7d40f89 c8c562a)
Merge branch 'cb/maint-no-double-merge'
authorJunio C Hamano <gitster@pobox.com>
Sat, 13 Jun 2009 19:50:22 +0000 (12:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 13 Jun 2009 19:50:22 +0000 (12:50 -0700)
* cb/maint-no-double-merge:
  refuse to merge during a merge

1  2 
builtin-merge.c patch | diff1 | diff2 | blob | history

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