FredrikNoren/ungit — pull request #314 by Fabbi (2014-02-21 19:45:56+00:00)
Title: Some Merge-Errors I stumbled upon.

- if remote master and local master were different and needed to be merged, ungit always said it was up to date.

- if remote and local tried both to add the same file you could not resolve the conflict