From 02081598c2dcf7faaa89ddac463232dce3aab215 Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Thu, 18 Apr 2013 17:53:15 -0500 Subject: Update files and references in support of bug report 1446. --- doc/en/merging.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/en/merging.html') diff --git a/doc/en/merging.html b/doc/en/merging.html index 7331292..712d9b1 100644 --- a/doc/en/merging.html +++ b/doc/en/merging.html @@ -1,4 +1,4 @@ -Merging And The Merge Output Editor Window
Merging And The Merge Output Editor Window
Prev
Next
File Comparison And Merge

Merging And The Merge Output Editor Window

+Merging And The Merge Output Editor Window

Merging And The Merge Output Editor Window
Prev
Next
File Comparison And Merge

Merging And The Merge Output Editor Window

The merge output editor window (below the diff input windows) also has an info line at the top showing "Output:", the filename and "[Modified]" if you edited something. Usually it will contain some text through the automatic merge facilities, but often it will also -- cgit v1.2.3