From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 17 Oct 2016 20:25:21 +0000 (-0700)
Subject: Merge branch 'da/mergetool-diff-order'
X-Git-Tag: v2.11.0-rc0~56
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5b4c45af0cb5cea7b26e2fb5464038f7663f5800;p=thirdparty%2Fgit.git

Merge branch 'da/mergetool-diff-order'

"git mergetool" learned to honor "-O<orderfile>" to control the
order of paths to present to the end user.

* da/mergetool-diff-order:
  mergetool: honor -O<orderfile>
  mergetool: honor diff.orderFile
  mergetool: move main program flow into a main() function
  mergetool: add copyright
---

5b4c45af0cb5cea7b26e2fb5464038f7663f5800