| Age | Commit message (Collapse) | Author | Files | Lines |
|---|
|
1) permissions aren't respected in the merge script (primarily because
they're never passed in to it in the first place). Fix that and also
check for permission conflicts in the merge
2) the delete of a file in both branches may indeed be just that, but it
could also be the indicator of a rename conflict (file moved to
different locations in both branches), so error out and ask the
committer for guidance.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
|
|
instead of a checked-out temporary copy.
If merging requires a checked-out-copy, we now do so with "unpack-file".
|
|
any unmerged files.
This one doesn't actually do the merging, but it makes it
easy to script the programs that do using it.
|
James Bottomley
Linus Torvalds