git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b9ebb65)
mergetool: take the "-O" out of $orderfile
authorRichard Hansen <redacted>
Tue, 10 Jan 2017 20:42:01 +0000 (15:42 -0500)
committerJunio C Hamano <redacted>
Tue, 10 Jan 2017 21:22:20 +0000 (13:22 -0800)
commitc1b0d3a010eaed0d7683fe0593132f2211467b20
treeeeef5c61236d6c07cc3a40b650a57653d6b8cfb4tree | snapshot
parentb9ebb659268ae1ecf742dff6261e87f4ee57dde7commit | diff
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 <redacted>
Signed-off-by: Junio C Hamano <redacted>
git-mergetool.sh diff | blob | history
git clone https://git.99rst.org/PROJECT