| commit | c1b0d3a010eaed0d7683fe0593132f2211467b20 | |
| author | Richard Hansen <hansenr@google.com> | |
| Tue, 10 Jan 2017 20:42:01 +0000 (10 15:42 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 10 Jan 2017 21:22:20 +0000 (10 13:22 -0800) | ||
| tree | eeef5c61236d6c07cc3a40b650a57653d6b8cfb4 | treesnapshot (tar.gz zip) |
| parent | b9ebb659268ae1ecf742dff6261e87f4ee57dde7 | commitdiff |
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>
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>
| git-mergetool.sh | diffblobblamehistory |