alextangxiao / excelmerge Goto Github PK

• English
• 日本語

ExcelMerge is a graphical display tool for Excel or CSV Diff. The current feature is limited only to the display of Diff, but the goal is to implement the merge feature. It can also be used as a diff tool for Git or Mercurial.

• Windows 7 or later

• .xls
• .xlsx
• .csv
• .tsv

Download ExcelMergeSetup.msi from here and Run.

ExcelMerge.GUI diff [Options]

.gitconfig

[diff]
tool = ExcelMerge

[difftool "ExcelMerge"]
cmd = \"C:/Program Files (x86)/ExcelMerge/ExcelMerge.GUI.exe\" diff -s \"$LOCAL\" -d \"$REMOTE\" -c WinMerge -i -w -v -k 

[alias]
windiff = difftool -g -y -t ExcelMerge

mercurial.ini

[merge-tools]
excelmerge.executable = C:\Program Files (x86)\ExcelMerge\ExcelMerge.GUI.exe
excelmerge.diffargs = diff -s $parent1 -d $child -c WinMerge -i -w -v -e empty -k

[tortoisehg]
vdiff = excelmerge

Register the external command specified by the command line argument --external-cmd.

Can also be executed from within the tool.

For each file you can specify a line header or a column header.

You can customize background colors.

By selecting Ctrl + D or "Output log" from the context menu, you can output the change as a log. The format can be changed from "differential extraction setting".

• If there are column deletions or additions, they may not be displayed at the expected position.

If the currently displayed header is not what you expect, you may resolve it by specifying the appropriate header and extract diff. Follow these steps.

1. Select appropriate header cell.
2. Right click to display the context menu.
3. Select "Extract diff with this row as header"

Copyright (c)2017 skanmera

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.