Merge [TRAFODION-2835] PR 1331 Add script to aid merge conflict resolution
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/d0cdf6a1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/d0cdf6a1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/d0cdf6a1 Branch: refs/heads/master Commit: d0cdf6a1a61b37e044e1f1b0bbe81737a9ed9c5a Parents: 890ec60 69e1574 Author: Dave Birdsall <[email protected]> Authored: Tue Dec 12 01:28:18 2017 +0000 Committer: Dave Birdsall <[email protected]> Committed: Tue Dec 12 01:28:18 2017 +0000 ---------------------------------------------------------------------- core/sqf/sql/scripts/beheadMergeConflict.py | 112 +++++++++++++++++++++++ 1 file changed, 112 insertions(+) ----------------------------------------------------------------------
