git.99rst.org Git - git.git/commit

author	Junio C Hamano <redacted>
	Tue, 17 Dec 2013 19:32:04 +0000 (11:32 -0800)
committer	Junio C Hamano <redacted>
	Tue, 17 Dec 2013 19:32:17 +0000 (11:32 -0800)
commit	4766036ecdee2d45b5a955409da5e6751c3e2f05
tree	7adcc5c39b32dc7e0cd850bcfad22e0bae7064c6	tree \| snapshot
parent	66c24cd8a4b8db93b5fee81f144d6411ac7e5391	commit \| diff
parent	77b43cac9feac1079f3643988cfadee63e4365f7	commit \| diff

Merge branch 'jk/two-way-merge-corner-case-fix' into maint

"git am --abort" sometimes complained about not being able to write
a tree with an 0{40} object in it.

* jk/two-way-merge-corner-case-fix:
  t1005: add test for "read-tree --reset -u A B"
  t1005: reindent
  unpack-trees: fix "read-tree -u --reset A B" with conflicted index

unpack-trees.c

diff1 |

diff2 |

blob | history

RSS Atom

git clone https://git.99rst.org/PROJECT