Revision 160252f81626d865b9e902abffe5e4976944c930 authored by Junio C Hamano on 03 November 2005, 09:51:25 UTC, committed by Junio C Hamano on 03 November 2005, 22:55:11 UTC
git-merge expects this check to be done appropriately by the merge strategy backends. In the case of merge-ours strategy, the resulting tree comes what we have in the index file, so it must match the current HEAD; otherwise it would not be "ours" merge. Signed-off-by: Junio C Hamano <junkio@cox.net>
1 parent 64da9e6
File | Mode | Size |
---|---|---|
.gitignore | -rw-r--r-- | 58 bytes |
changelog | -rw-r--r-- | 2.3 KB |
compat | -rw-r--r-- | 2 bytes |
control | -rw-r--r-- | 1.1 KB |
copyright | -rw-r--r-- | 978 bytes |
docs | -rw-r--r-- | 7 bytes |
git-core.doc-base | -rw-r--r-- | 237 bytes |
git-core.files | -rw-r--r-- | 5 bytes |
git-tk.files | -rw-r--r-- | 72 bytes |
rules | -rwxr-xr-x | 2.1 KB |
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...