bicou@mba ~/AndroidStudioProjects/xxx (master) $ git status
On branch master
Your branch is ahead of 'origin/master' by 30 commits.
  (use "git push" to publish your local commits)

You have unmerged paths.
  (fix conflicts and run "git commit")
  (use "git merge --abort" to abort the merge)

Changes to be committed:

    modified:   alpha.sh

Unmerged paths:
  (use "git add <file>..." to mark resolution)

    both modified:   app/src/main/res/values-fr/strings.xml

bicou@mba ~/AndroidStudioProjects/xxx (master) $ tail -5 app/src/main/res/values-fr/strings.xml
<<<<<<< HEAD
</resources>
=======
</resources>
>>>>>>> develop

bicou@mba ~/AndroidStudioProjects/xxx (master) $ tail -5 app/src/main/res/values-fr/strings.xml | tail -2 | head -1 | xxd
00000000: 3c2f 7265 736f 7572 6365 733e 0a         </resources>.

bicou@mba ~/AndroidStudioProjects/xxx (master) $ tail -5 app/src/main/res/values-fr/strings.xml | head -2 | tail -1 | xxd
00000000: 3c2f 7265 736f 7572 6365 733e 0a         </resources>.

bicou@mba ~/AndroidStudioProjects/xxx (master) $ git diff develop -- app/src/main/res/values-fr/strings.xml
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 5804034..2097f87 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -96,4 +96,4 @@
     <string name="fragment_min_max_set_button">Valider</string>
     <string name="fragment_min_max_clear_button">Effacer</string>
     <string name="drawer_name_no_account">Invité</string>
-</resources>
 No newline at end of file
+</resources>