OSDN Git Service
(root)
/
winmerge-jp
/
winmerge-jp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
844221e
)
MergeDoc.h: Remove unused function declaration
author
sdottaka
<sdottaka@users.sourceforge.net>
Sun, 8 Feb 2015 16:15:34 +0000
(
01:15
+0900)
committer
sdottaka
<sdottaka@users.sourceforge.net>
Sun, 8 Feb 2015 16:15:34 +0000
(
01:15
+0900)
--HG--
branch : stable
Src/MergeDoc.h
patch
|
blob
|
history
diff --git
a/Src/MergeDoc.h
b/Src/MergeDoc.h
index
d5b555e
..
40b0c74
100644
(file)
--- a/
Src/MergeDoc.h
+++ b/
Src/MergeDoc.h
@@
-206,7
+206,6
@@
public:
int Rescan(bool &bBinary, IDENTLEVEL &identical, bool bForced = false);
void CheckFileChanged(void);
void ShowRescanError(int nRescanResult, IDENTLEVEL identical);
- void AddUndoAction(UINT nBegin, UINT nEnd, UINT nDiff, int nBlanks, bool bInsert, CMergeEditView *pList);
bool Undo();
void CopyAllList(int srcPane, int dstPane);
void CopyMultipleList(int srcPane, int dstPane, int firstDiff, int lastDiff);