projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ae5a97f c5ab03f)
Merge branch 'cb/maint-merge-recursive-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 13 Jan 2009 09:13:56 +0000 (01:13 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 13 Jan 2009 09:13:56 +0000 (01:13 -0800)
commit9e8f6e7f6e8817db30a492e32fa92c1daf51b77c
tree9bd0d722d8f08422a0141a870a3772a1a8962d62tree | snapshot
parentae5a97fdd0c553926aabdf324b6d9108b0699beecommit | diff
parentc5ab03f26c992e30f355fba129f70db0f290fcd7commit | diff
Merge branch 'cb/maint-merge-recursive-fix' into maint

* cb/maint-merge-recursive-fix:
  merge-recursive: do not clobber untracked working tree garbage
  modify/delete conflict resolution overwrites untracked file

Conflicts:
builtin-merge-recursive.c
merge-recursive.c diff1 | | blob | history
Unnamed repository; edit this file 'description' to name the repository.