aboutsummaryrefslogtreecommitdiff
path: root/compat
diff options
context:
space:
mode:
authorRichard Hansen <hansenr@google.com>2017-01-10 15:42:01 -0500
committerJunio C Hamano <gitster@pobox.com>2017-01-10 13:22:20 -0800
commitc1b0d3a010eaed0d7683fe0593132f2211467b20 (patch)
treeeeef5c61236d6c07cc3a40b650a57653d6b8cfb4 /compat
parentb9ebb659268ae1ecf742dff6261e87f4ee57dde7 (diff)
downloadgit-c1b0d3a010eaed0d7683fe0593132f2211467b20.tar.gz
git-c1b0d3a010eaed0d7683fe0593132f2211467b20.tar.xz
mergetool: take the "-O" out of $orderfile
This will make it easier for a future commit to convert a relative orderfile pathname to either absolute or relative to the top-level directory. It also improves code readability. Signed-off-by: Richard Hansen <hansenr@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'compat')
0 files changed, 0 insertions, 0 deletions