OSDN Git Service

(root) / winmerge-jp / winmerge-jp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e7a2985)
Show/hide the directory with the following menu items in the folder compare window...
authorTakashi Sawanaka <sdottaka@users.sourceforge.net>
Wed, 25 Jan 2023 14:42:35 +0000 (23:42 +0900)
committerTakashi Sawanaka <sdottaka@users.sourceforge.net>
Wed, 25 Jan 2023 14:42:35 +0000 (23:42 +0900)
- "View" > "3-way Compare" > "Show Left Only Different Items"
- "View" > "3-way Compare" > "Show Middle Only Different Items"
- "View" > "3-way Compare" > "Show Right Only Different Items"

18 files changed:
Testing/Data/Compare/Dir1/dir1only_diff/file1.txt [new file with mode: 0644] patch | blob
Testing/Data/Compare/Dir1/dir1only_diff/file2.txt [new file with mode: 0644] patch | blob
Testing/Data/Compare/Dir1/dir2only_diff/file1.txt [new file with mode: 0644] patch | blob
Testing/Data/Compare/Dir1/dir2only_diff/file2.txt [new file with mode: 0644] patch | blob
Testing/Data/Compare/Dir1/dir3only_diff/file1.txt [new file with mode: 0644] patch | blob
Testing/Data/Compare/Dir1/dir3only_diff/file2.txt [new file with mode: 0644] patch | blob
Testing/Data/Compare/Dir2/dir1only_diff/file1.txt [new file with mode: 0644] patch | blob
Testing/Data/Compare/Dir2/dir1only_diff/file2.txt [new file with mode: 0644] patch | blob
Testing/Data/Compare/Dir2/dir2only_diff/file1.txt [new file with mode: 0644] patch | blob
Testing/Data/Compare/Dir2/dir2only_diff/file2.txt [new file with mode: 0644] patch | blob
Testing/Data/Compare/Dir2/dir3only_diff/file1.txt [new file with mode: 0644] patch | blob
Testing/Data/Compare/Dir2/dir3only_diff/file2.txt [new file with mode: 0644] patch | blob
Testing/Data/Compare/Dir3/dir1only_diff/file1.txt [new file with mode: 0644] patch | blob
Testing/Data/Compare/Dir3/dir1only_diff/file2.txt [new file with mode: 0644] patch | blob
Testing/Data/Compare/Dir3/dir2only_diff/file1.txt [new file with mode: 0644] patch | blob
Testing/Data/Compare/Dir3/dir2only_diff/file2.txt [new file with mode: 0644] patch | blob
Testing/Data/Compare/Dir3/dir3only_diff/file1.txt [new file with mode: 0644] patch | blob
Testing/Data/Compare/Dir3/dir3only_diff/file2.txt [new file with mode: 0644] patch | blob

diff --git a/Testing/Data/Compare/Dir1/dir1only_diff/file1.txt b/Testing/Data/Compare/Dir1/dir1only_diff/file1.txt
new file mode 100644 (file)
index 0000000..9ae9e86
--- /dev/null
+++ b/Testing/Data/Compare/Dir1/dir1only_diff/file1.txt
@@ -0,0 +1 @@
+ab
\ No newline at end of file
diff --git a/Testing/Data/Compare/Dir1/dir1only_diff/file2.txt b/Testing/Data/Compare/Dir1/dir1only_diff/file2.txt
new file mode 100644 (file)
index 0000000..b5b5773
--- /dev/null
+++ b/Testing/Data/Compare/Dir1/dir1only_diff/file2.txt
@@ -0,0 +1 @@
+bb
\ No newline at end of file
diff --git a/Testing/Data/Compare/Dir1/dir2only_diff/file1.txt b/Testing/Data/Compare/Dir1/dir2only_diff/file1.txt
new file mode 100644 (file)
index 0000000..2e65efe
--- /dev/null
+++ b/Testing/Data/Compare/Dir1/dir2only_diff/file1.txt
@@ -0,0 +1 @@
+a
\ No newline at end of file
diff --git a/Testing/Data/Compare/Dir1/dir2only_diff/file2.txt b/Testing/Data/Compare/Dir1/dir2only_diff/file2.txt
new file mode 100644 (file)
index 0000000..63d8dbd
--- /dev/null
+++ b/Testing/Data/Compare/Dir1/dir2only_diff/file2.txt
@@ -0,0 +1 @@
+b
\ No newline at end of file
diff --git a/Testing/Data/Compare/Dir1/dir3only_diff/file1.txt b/Testing/Data/Compare/Dir1/dir3only_diff/file1.txt
new file mode 100644 (file)
index 0000000..2e65efe
--- /dev/null
+++ b/Testing/Data/Compare/Dir1/dir3only_diff/file1.txt
@@ -0,0 +1 @@
+a
\ No newline at end of file
diff --git a/Testing/Data/Compare/Dir1/dir3only_diff/file2.txt b/Testing/Data/Compare/Dir1/dir3only_diff/file2.txt
new file mode 100644 (file)
index 0000000..63d8dbd
--- /dev/null
+++ b/Testing/Data/Compare/Dir1/dir3only_diff/file2.txt
@@ -0,0 +1 @@
+b
\ No newline at end of file
diff --git a/Testing/Data/Compare/Dir2/dir1only_diff/file1.txt b/Testing/Data/Compare/Dir2/dir1only_diff/file1.txt
new file mode 100644 (file)
index 0000000..2e65efe
--- /dev/null
+++ b/Testing/Data/Compare/Dir2/dir1only_diff/file1.txt
@@ -0,0 +1 @@
+a
\ No newline at end of file
diff --git a/Testing/Data/Compare/Dir2/dir1only_diff/file2.txt b/Testing/Data/Compare/Dir2/dir1only_diff/file2.txt
new file mode 100644 (file)
index 0000000..63d8dbd
--- /dev/null
+++ b/Testing/Data/Compare/Dir2/dir1only_diff/file2.txt
@@ -0,0 +1 @@
+b
\ No newline at end of file
diff --git a/Testing/Data/Compare/Dir2/dir2only_diff/file1.txt b/Testing/Data/Compare/Dir2/dir2only_diff/file1.txt
new file mode 100644 (file)
index 0000000..9ae9e86
--- /dev/null
+++ b/Testing/Data/Compare/Dir2/dir2only_diff/file1.txt
@@ -0,0 +1 @@
+ab
\ No newline at end of file
diff --git a/Testing/Data/Compare/Dir2/dir2only_diff/file2.txt b/Testing/Data/Compare/Dir2/dir2only_diff/file2.txt
new file mode 100644 (file)
index 0000000..b5b5773
--- /dev/null
+++ b/Testing/Data/Compare/Dir2/dir2only_diff/file2.txt
@@ -0,0 +1 @@
+bb
\ No newline at end of file
diff --git a/Testing/Data/Compare/Dir2/dir3only_diff/file1.txt b/Testing/Data/Compare/Dir2/dir3only_diff/file1.txt
new file mode 100644 (file)
index 0000000..2e65efe
--- /dev/null
+++ b/Testing/Data/Compare/Dir2/dir3only_diff/file1.txt
@@ -0,0 +1 @@
+a
\ No newline at end of file
diff --git a/Testing/Data/Compare/Dir2/dir3only_diff/file2.txt b/Testing/Data/Compare/Dir2/dir3only_diff/file2.txt
new file mode 100644 (file)
index 0000000..63d8dbd
--- /dev/null
+++ b/Testing/Data/Compare/Dir2/dir3only_diff/file2.txt
@@ -0,0 +1 @@
+b
\ No newline at end of file
diff --git a/Testing/Data/Compare/Dir3/dir1only_diff/file1.txt b/Testing/Data/Compare/Dir3/dir1only_diff/file1.txt
new file mode 100644 (file)
index 0000000..2e65efe
--- /dev/null
+++ b/Testing/Data/Compare/Dir3/dir1only_diff/file1.txt
@@ -0,0 +1 @@
+a
\ No newline at end of file
diff --git a/Testing/Data/Compare/Dir3/dir1only_diff/file2.txt b/Testing/Data/Compare/Dir3/dir1only_diff/file2.txt
new file mode 100644 (file)
index 0000000..63d8dbd
--- /dev/null
+++ b/Testing/Data/Compare/Dir3/dir1only_diff/file2.txt
@@ -0,0 +1 @@
+b
\ No newline at end of file
diff --git a/Testing/Data/Compare/Dir3/dir2only_diff/file1.txt b/Testing/Data/Compare/Dir3/dir2only_diff/file1.txt
new file mode 100644 (file)
index 0000000..2e65efe
--- /dev/null
+++ b/Testing/Data/Compare/Dir3/dir2only_diff/file1.txt
@@ -0,0 +1 @@
+a
\ No newline at end of file
diff --git a/Testing/Data/Compare/Dir3/dir2only_diff/file2.txt b/Testing/Data/Compare/Dir3/dir2only_diff/file2.txt
new file mode 100644 (file)
index 0000000..63d8dbd
--- /dev/null
+++ b/Testing/Data/Compare/Dir3/dir2only_diff/file2.txt
@@ -0,0 +1 @@
+b
\ No newline at end of file
diff --git a/Testing/Data/Compare/Dir3/dir3only_diff/file1.txt b/Testing/Data/Compare/Dir3/dir3only_diff/file1.txt
new file mode 100644 (file)
index 0000000..9ae9e86
--- /dev/null
+++ b/Testing/Data/Compare/Dir3/dir3only_diff/file1.txt
@@ -0,0 +1 @@
+ab
\ No newline at end of file
diff --git a/Testing/Data/Compare/Dir3/dir3only_diff/file2.txt b/Testing/Data/Compare/Dir3/dir3only_diff/file2.txt
new file mode 100644 (file)
index 0000000..b5b5773
--- /dev/null
+++ b/Testing/Data/Compare/Dir3/dir3only_diff/file2.txt
@@ -0,0 +1 @@
+bb
\ No newline at end of file
About OSDN
Find Software
Develop Software
Help