tree f4930d7a66be1908ce64f166963a774e67cb270e
parent 2ae84c320a34ce3e29eaae72292ff7f1b5d723ba
author Demetr Starshov <dstarshov@google.com> 1597269670 -0700
committer Demetr Starshov <dstarshov@google.com> 1598492428 -0700

ResolveMerger: do not content-merge gitlinks on del/mod conflicts

Previously ResolveMerger tried to make a fulltext merge entry in case
one of sides got deleted regardless of file mode. This is not
applicable for GITLINK type of entry. After this change it is
rendering appropriate merge result.

Signed-off-by: Demetr Starshov <dstarshov@google.com>
Change-Id: Ibdb4557bf8781bdb48bcee6529e37dc80582ed7e