From: nemo <nemo@ikkoku.de>
Date: Fri, 10 May 2013 12:10:47 GMT
Subject: Conflict removed lines from the change set
Message-ID: <1368187847.18427.8.camel@nemo>

It seems that on conflict git 1.8.1.2 removes lines
below the preserved line.

Before merging my master branch onto my staging branch
I have this in the soon to be conflicting file:

  [... stuff ...]
  lib.printMenuBottom.10.20.typolink.additionalParams =
&print=1&no_cache=1
  [... stuff ...]

The changes from master look like this:

  [... stuff ...]
+
+ [globalVar = GP:tx_gois24api_piModeratedShow|action|show = expose]
+ lib.printMenuBottom.10.20.typolink.additionalParams =
&print=1&no_cache=1&type=26
+ [else]
  lib.printMenuBottom.10.20.typolink.additionalParams =
&print=1&no_cache=1
 +[global]
  [... stuff ...]

After merging and having a conflict git-diff reports this:

++<<<<<<< HEAD
++=======
+ 
+ [globalVar = GP:tx_gois24api_piModeratedShow|action|show = expose]
+ lib.printMenuBottom.10.20.typolink.additionalParams =
&print=1&no_cache=1&type=26
+ [else]
++>>>>>>> master
  lib.printMenuBottom.10.20.typolink.additionalParams =
&print=1&no_cache=1
 -[global]
 -

Why is the [global] line marked for removal? I presume that this
should not be the case.