Andrew's git / gitweb.git / commit
?
merge-recursive: match the unmerged index entry behaviour with merge-resolve
authorJunio C Hamano <junkio@cox.net>
Wed, 30 Nov 2005 10:37:06 +0000 (02:37 -0800)
committerJunio C Hamano <junkio@cox.net>
Wed, 30 Nov 2005 10:37:06 +0000 (02:37 -0800)
commit58cce8a...5da745e20c9527c569a0e0935ff3ab30
treeaa034aa...715069a0e3abe08628bc4393eaa34a61copy hash to clipboard (tree)
parent15bf57a...8aaf10c038e2026dfe54281edbb6080acopy hash to clipboard (diff)
git-merge-recursive.py diff | blob | history