From: Len Brown <len.brown@intel.com>
Date: Thu, 4 Aug 2005 04:17:42 +0000 (-0400)
Subject: When a merge does not work automatically, git prevents
X-Git-Tag: v2.6.14-rc1~256^2~14^2~41^2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd6dbdf3c7b9784fbf5d8500e427a954e27a976a;p=linux-2.6

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.
---

bd6dbdf3c7b9784fbf5d8500e427a954e27a976a
diff --cc drivers/acpi/dispatcher/dswload.c
index d2c603f54f,d116200184..9100c0bda4
--- a/drivers/acpi/dispatcher/dswload.c
+++ b/drivers/acpi/dispatcher/dswload.c
@@@ -983,6 -959,6 +983,7 @@@ acpi_ds_load2_end_op 
  				  ACPI_NS_SEARCH_PARENT | ACPI_NS_DONT_OPEN_SCOPE,
  				  walk_state, &(new_node));
  		if (ACPI_SUCCESS (status)) {
++
  			/*
  			 * Make sure that what we found is indeed a method
  			 * We didn't search for a method on purpose, to see if the name