Files
git/Documentation
Junio C Hamano 5b4c45af0c 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
2016-10-17 13:25:21 -07:00
..
2016-10-11 14:55:48 -07:00
2016-09-12 15:03:32 -07:00
2016-07-13 11:24:14 -07:00
2016-10-10 14:03:51 -07:00
2016-10-10 14:03:50 -07:00
2016-10-17 13:25:19 -07:00
2016-07-13 11:24:14 -07:00
2016-07-28 11:25:54 -07:00
2015-07-21 14:08:14 -07:00
2016-08-11 14:35:42 -07:00
2015-10-05 12:30:13 -07:00
2016-10-03 13:24:18 -07:00
2016-08-11 14:35:42 -07:00
2016-03-03 13:43:36 -08:00