git.openpandora.org / pandora-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: aefdcfa d4ab025)
When a merge does not work automatically, git prevents
authorLen Brown <len.brown@intel.com>
Thu, 4 Aug 2005 04:17:42 +0000 (00:17 -0400)
committerLen Brown <len.brown@intel.com>
Thu, 4 Aug 2005 04:17:42 +0000 (00:17 -0400)
commitbd6dbdf3c7b9784fbf5d8500e427a954e27a976a
tree9e626720517f1a0e92561b191e20640ed0af6362tree | snapshot
parentaefdcfa6c243702f1d35d23515d0e5eeca225c97commit | diff
parentd4ab025b73a2d10548e17765eb76f3b7351dc611commit | diff
When a merge does not work automatically, git prevents
commit from running until a change has been made in
the destination.  In this instance the desired result
was to choose the destination version of the file
and ignore the source version, but git would not
allow that.

Here I added a blank line to let git commit think
I resolved a merge conflict.
drivers/acpi/dispatcher/dswload.c diff1 | diff2 | blob | history
Pandora Kernel Repository