diff options
author | Richard Hansen <hansenr@google.com> | 2017-01-10 15:42:01 -0500 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-01-10 13:22:20 -0800 |
commit | c1b0d3a010eaed0d7683fe0593132f2211467b20 (patch) | |
tree | eeef5c61236d6c07cc3a40b650a57653d6b8cfb4 /diff.h | |
parent | b9ebb659268ae1ecf742dff6261e87f4ee57dde7 (diff) | |
download | git-c1b0d3a010eaed0d7683fe0593132f2211467b20.tar.gz |
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 'diff.h')
0 files changed, 0 insertions, 0 deletions